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

* commit 'c6afbb68897c84ea0c34c783ff0406d3bae59412':