Android 2.1 release 2.1s
merge from open-source master