Revert temporary fix for GPS.

Relies on http://review.cyanogenmod.org/#/c/31864/

Also some whitespace and stale comment cleanup..

Change-Id: Ibe1db09cb71ba57cc653fa0c71dd35ce5ad92e61