am 8c1fc834: am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager."

* commit '8c1fc83445f8dce7e6d0789feeed8bf98d33bf01':
  Extended locales in AAPT / AssetManager.