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

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