Merge "Fix AAPT-compatible output format for locales" into nyc-mr1-dev