am d4a0686d: am 2a8f3b0c: Merge "Fix ICU glue for uloc_toLanguageTag."

* commit 'd4a0686d1a08f2e15f5de15ec9e7b37c3bf05e04':
  Fix ICU glue for uloc_toLanguageTag.