Merge "Merge \\"Removing N from PLATFORM_VERSION_ALL_CODENAMES\\" into nyc-dev am: ddc0c5e0a0 am: 0c822614f5" into nyc-mr1-dev-plus-aosp