Merge change 23348 into eclair

* changes:
  Update crypto package to Harmony r802921. Only Javadoc changes.