am 797ed934: am 36b41316: am ed7d47c5: am b288a5ad: Merge "Use the icu4c headers from the new location."

* commit '797ed93419c4985a5c9a19b97b7f564e304fab9b':