Merge \"Fix mistranslation from the NDK changelog.\" into nyc-dev
am: 95fbc2de1b

Change-Id: Ia390c00f6884b73c625fffa3aabde4b53e4ebe90