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

Change-Id: I612b9e58060b46af2b1dce7f6d0faf91d9674d8c