Merge \\"Removing N from PLATFORM_VERSION_ALL_CODENAMES\\" into nyc-dev am: ddc0c5e0a0
am: 222ab7d2dd

Change-Id: I72deff3996cbfb9703dca70c6ecf5bf15247978b