Merge "Revert "Setting PLATFORM_VERSION(_CODENAME)? to O for master""