Merge changes Ice94bae5,Icaabf728,I62f56f3f,I1ff4db67

* changes:
  Add change markers to misc files in java.text.
  Add Android change comments to Collators.
  Comment removal of regarding BreakIteratorProvider
  Add missing Android-changed comments to Bidi.java