Merge "Revert "Migrate Collator classes to use ICU4J.""