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

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