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

* commit '56f30b1143a17bbc4a062ae50e6d8d0587261579':
  Remove hardcoded ICU include paths.