Android 2.1 release 2.1s
Merge donut into master