Revert "Revert "Revert "Squashed commit of GPS changes from CodeAurora"""

This reverts commit cd68cce953d911728f004abfad448e4dc180087a.

	modified:   core/java/com/android/internal/os/ZygoteInit.java
	modified:   services/java/com/android/server/LocationManagerService.java
	modified:   services/java/com/android/server/location/GpsLocationProvider.java
	modified:   services/jni/com_android_server_location_GpsLocationProvider.cpp