add qcom/gps

Change-Id: I735cda0a9c47f1dbba781b705c64f8e1f20c36e8
Merge "add qcom/gps" into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2

Conflicts:
	default.xml