Merge "Merge \"Merge \\"Fix mistranslation from the NDK changelog.\\" into nyc-dev am: 95fbc2de1b\" into nyc-mr1-dev am: 157c6811de" into nyc-mr1-dev-plus-aosp