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

* commit 'b288a5ad024f99d593aef55e352b46c1a2868af7':
  Use the icu4c headers from the new location.