am ec276ed1: am 11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE] automerge: fcaf3e9  -s ours

* commit 'ec276ed12645cc1c735babab1dc7d272fc96a292':