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

* commit '59c615015d880d7d4a0749b78073363512836401':
  Remove hardcoded ICU include paths.