Merge "Fix mistranslation from the NDK changelog." into nyc-dev