Android 2.1 release 2
merge from open-source master