am 2d34a33a: Merge change 23348 into eclair

Merge commit '2d34a33a3d14ceda01c9bddfd957c3b9d3c55aa1' into eclair-plus-aosp

* commit '2d34a33a3d14ceda01c9bddfd957c3b9d3c55aa1':
  Update crypto package to Harmony r802921. Only Javadoc changes.