Android 2.3 CTS release 12
Merge "Merge "Fix emulator GPS support"" into tools_r7