Do not define superfluous wpa_supplicant service

Bug: 30816535
Change-Id: Iab4e212b1c2dcbb97e73945e6b807b37174e0ae0
(cherry picked from commit 8a396d3b3827968bb33e6f7f0f6d74d14a6f4da9)
diff --git a/init.bullhead.rc b/init.bullhead.rc
index 2796b03..2250ed1 100644
--- a/init.bullhead.rc
+++ b/init.bullhead.rc
@@ -323,19 +323,6 @@
     group root
 
 service wpa_supplicant /system/bin/wpa_supplicant \
-    -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
-    -I/system/etc/wifi/wpa_supplicant_overlay.conf \
-    -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
-    #   we will start as root and wpa_supplicant will switch to user wifi
-    #   after setting up the capabilities required for WEXT
-    #   user wifi
-    #   group wifi inet keystore
-    class main
-    socket wpa_wlan0 dgram 660 wifi wifi
-    disabled
-    oneshot
-
-service p2p_supplicant /system/bin/wpa_supplicant \
     -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \
     -I/system/etc/wifi/p2p_supplicant_overlay.conf -N \
     -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \