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

* commit 'bf527a1f68a69d0b4f1f677c51b7edeb2c5d46af':