Merge "Revert an unnecessary patch in java.text.CollationElementIterator" into sc-dev