Merge "Use -Werror in hardware/qcom/gps" am: ee55aa356c
am: 3375692c20

Change-Id: I16f8f503a8a6653a1049498761271e7bb10a7a08