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

Change-Id: I89d6e42aee6a9662947a1846937bdb485629aa23