am 49024bac: Merge "AssetManager support for 3 letter lang/country codes."

* commit '49024bacf63db39467e7f318c682ad771ec0de22':
  AssetManager support for 3 letter lang/country codes.