Merge "Removing N from PLATFORM_VERSION_ALL_CODENAMES" into nyc-dev