Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file."
diff --git a/init.deb.rc b/init.deb.rc
index 6976dae..0a70929 100644
--- a/init.deb.rc
+++ b/init.deb.rc
@@ -205,6 +205,9 @@
     mkdir /data/qcks 0770 system system
     chown system /dev/block/platform/msm_sdcc.1/by-name
 
+    # Remove old socket so that it is re-created in the right context.
+    rm /data/app/sensor_ctl_socket
+
     setprop vold.post_fs_data_done 1
 
     rm /data/local/tmp/adreno_config.txt