Android 2.3.6 release 0.9
merge from open-source master

Change-Id: I8fa5fe12f60d0de2a0f6e0f9c567104253bcbea3