Merge "Add proper ifdefs and missing values to platform detection code"