Merge "Use new naming scheme for TARGET_PLATFORM_VERSION"