am 52baf3d0: (-s ours) am 77d6f36b: Revert "DO NOT MERGE Implement line breaking using ICU break iterator"

* commit '52baf3d096ae72de4264183d26465a90bba2550a':
  Revert "DO NOT MERGE Implement line breaking using ICU break iterator"