am f14a3951: Merge "Remove hardcoded ICU include paths."

* commit 'f14a39512af37ba6200e4eb9a9f80658d24a3d8a':
  Remove hardcoded ICU include paths.