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

* commit 'fcaf3e9bd031e1ad4c38eee1b81064cca75e26b4':