Merge change 22482 into eclair

* changes:
  Update java.text to Harmony r802921.