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