More adjustments for GPS.
Unfortunately, it's still not working. However, I am hoping this will get us closer.
GPS shim is disabled, but I'm leaving it in there unless/until I know we don't need it.
Also fixes a bluetooth typo.

Change-Id: I18a4d31d30fc63ad6cdff006eb4857c269ecdd49