Android 2.3.3 release 1
merge from open-source master

Change-Id: I8fa5fe12f60d0de2a0f6e0f9c567104253bcbea3