Merge change 21305 into donut

* changes:
  Bump release version to android-1.6_r1