Merge change 25629 into eclair

* changes:
  Android side of the fix for [2121211] Sholes has stutter during animations