update gps.h for lollipop

Conflicts:
	include/hardware/gps.h