s4-common: update gps.h

Change-Id: I929590cfbf114e59b3de519d2d0b5e56498a6489
Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>
s4-common: set recovery fstab version to 2

Change-Id: I4ebc75f4b507eb912ad3f4b5fbad4f8cae890c72
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2