Merge \"Merge \\"Merge \\\"Fix mistranslation from the NDK changelog.\\\" into...
Merge \"Merge \\"Merge \\\"Fix mistranslation from the NDK changelog.\\\" into nyc-dev am: 95fbc2de\\" into nyc-mr1-dev am: 157c6811\" into nyc-mr1-dev-plus-aosp
am: f814c237
Change-Id: I670569cf5ff69da66963f01ce3fb35bcddaee70d