Revert GPS changes for now until issues are resolved.
Will do a refactoring to better isolate this code.
Revert "GPS fixes"
This reverts commit 84c6741f.
Revert "Squashed commit of GPS changes from CodeAurora"
This reverts commit 66978614.
Change-Id: Ib1a55d1be8dbc933c690b2f06af206ab5511903c