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

* commit 'ed7d47c5901e32da3f7595cd6f4a25cae95d5f69':