Android 2.3.6 release 1
merge from open-source master

Change-Id: I28be55e2d649c8d52ad7ed47c5a19221a886ae7b