Android 1.6 release 2
Merge branch 'donut' into donut-release