am be57fca4: Merge "Extended locales in AAPT / AssetManager."

* commit 'be57fca41a731217010d9f92554cf48708b06ecf':
  Extended locales in AAPT / AssetManager.