Revert "Separate gps from init.gs101.rc"

This reverts commit 5c34fffc06d4842e8733591876c4a4c8aa70776f.

Reason for revert: <b/198158466, will re-land with a suitable fix>

Change-Id: If9fa482e4e0f247a66cc665c1e7f2f7c971efb21

conf/init.gs101.rc

@@ -601,6 +601,36 @@ service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
     oneshot
 
 
+# GPS
+service lhd /vendor/bin/hw/lhd /vendor/etc/gnss/lhd.conf
+    class main
+    user gps
+    group system inet net_raw sdcard_rw
+    ioprio be 0
+
+service gpsd /vendor/bin/hw/gpsd -c /vendor/etc/gnss/gps.xml
+    class main
+    user gps
+    group system gps radio inet wakelock sdcard_rw net_raw
+    ioprio be 0
+
+service scd /vendor/bin/hw/scd /vendor/etc/gnss/scd.conf
+    class main
+    user gps
+    group system inet net_raw wakelock
+    ioprio be 0
+
+service gnss_service /vendor/bin/hw/android.hardware.gnss@2.1-service-brcm
+    class hal
+    user gps
+    group system gps radio
+
+# disable gps service if no gps h/w
+on property:vendor.ril.cbd.svc=0
+    stop gpsd
+    stop lhd
+    stop scd
+
 # on userdebug and eng builds, enable kgdb on the serial console
 on property:ro.debuggable=1
     write /sys/module/kgdboc/parameters/kgdboc ttyFIQ1

gnss/init.gps.rc

@@ -1,28 +0,0 @@
-service lhd /vendor/bin/hw/lhd /vendor/etc/gnss/lhd.conf
-    class main
-    user gps
-    group system inet net_raw sdcard_rw
-    ioprio be 0
-
-service gpsd /vendor/bin/hw/gpsd -c /vendor/etc/gnss/gps.xml
-    class main
-    user gps
-    group system gps radio inet wakelock sdcard_rw net_raw
-    ioprio be 0
-
-service scd /vendor/bin/hw/scd /vendor/etc/gnss/scd.conf
-    class main
-    user gps
-    group system inet net_raw wakelock
-    ioprio be 0
-
-service gnss_service /vendor/bin/hw/android.hardware.gnss@2.1-service-brcm
-    class hal
-    user gps
-    group system gps radio
-
-# disable gps service if no gps h/w
-on property:vendor.ril.cbd.svc=0
-    stop gpsd
-    stop lhd
-    stop scd