am 430ded12: Merge "Remove hardcoded ICU include paths."

* commit '430ded12abc716b6a3756a52c4f534e7e0455655':
  Remove hardcoded ICU include paths.