am 4791a7f6: am c6afbb68: am c400ffb9: am b288a5ad: Merge "Use the icu4c headers from the new location."

* commit '4791a7f6a6910e6c50457b5ce6269e35bbc95541':