Revert \\"Removing N from PLATFORM_VERSION_ALL_CODENAMES\\" am: dc15ebc26c
am: 5f3f715aac  -s ours

Change-Id: I725e7a591a6d3726f22ce032d885fac9fd3f4fd7