m4: Update GPS HAL for lollipop

Change-Id: Id8c71bda583fc15024a0884c8bb1d0296e5dde68

Conflicts:
	gps/gps.conf
Merge branch 'cm-12.0' of github.com:uberlaggydarwin/animated-spice into cm-12.0