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

* commit '28879bbfe89dc4bf2067a7183975ecffb82f68e6':
  Extended locales in AAPT / AssetManager.