Merge "add qcom/gps" into cm-10.2