Fix GPS headers to work with CyanogenMod

Change-Id: Ib232c764ddd828fac630030eda1857033cdac955