Android 2.1 release 1
merge from open-source master