am b8fcb81f: Merge "Revert "Revert "Migrate Collator classes to use ICU4J."""

* commit 'b8fcb81f03613bd18c6a64ff17ef01f17dbe3c57':
  Revert "Revert "Migrate Collator classes to use ICU4J.""