am df60455b: Merge change 25126 into eclair

Merge commit 'df60455be5d9d3069a07f293b4021dd184cddc2a' into eclair-plus-aosp

* commit 'df60455be5d9d3069a07f293b4021dd184cddc2a':
  Update archive to the r802921 from Harmony.