Android 2.3.6 release 1
Merge "Merge "Fix emulator GPS support"" into tools_r7