am 918cec2c: am 59c61501: Merge "Remove hardcoded ICU include paths."

* commit '918cec2c0c1cd4e104babb39af255b2885c39696':
  Remove hardcoded ICU include paths.