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

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