Remove gps/etc and change references to hardware/qcom