Android 2.1 release 2.1p2
merge from open-source master