Android 2.1 release 1
Merge donut into master