Android 2.1 release 2.1p2
Merge donut into master