Android 1.6 release 1.4
merge cupcake into donut