Merge remote-tracking branch 'x86/oreo-x86' into pie-x86

diff --combined init.x86.rc
index 2d28986,bdb05e2..b36a722
--- 1/init.x86.rc
--- 2/init.x86.rc
+++ b/init.x86.rc
@@@ -18,13 -18,12 +18,14 @@@ on post-f
      exec u:r:init:s0 -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh
  
  on post-fs-data
 -    mkdir /data/misc/wifi 0770 wifi wifi
 -    mkdir /data/misc/wifi/sockets 0770 wifi wifi
 -    mkdir /data/misc/wifi/wpa_supplicant 0770 wifi wifi
 +    # Create the directories used by the Wireless subsystem
 +    mkdir /data/vendor/wifi 0771 wifi wifi
 +    mkdir /data/vendor/wifi/wpa 0770 wifi wifi
 +    mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi
      mkdir /data/misc/dhcp 0770 dhcp dhcp
 +
      mkdir /data/system 0775 system system
+     chown wifi wifi /data/misc/wifi/wpa_supplicant.conf
  
      # Set indication (checked by vold) that we have finished this action
      setprop vold.post_fs_data_done 1
@@@ -48,14 -47,14 +49,14 @@@ on boo
      setprop sys.media.vdec.drop 0
  
  service wpa_supplicant /vendor/bin/hw/wpa_supplicant -dd \
 -    -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
 -    -I/system/etc/wifi/wpa_supplicant_overlay.conf \
 -    -O/data/misc/wifi/sockets \
 -    -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
 +    -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 \
 +    -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
 +    interface android.hardware.wifi.supplicant@1.0::ISupplicant default
 +    interface android.hardware.wifi.supplicant@1.1::ISupplicant default
      class main
      socket wpa_wlan0 dgram 660 wifi wifi
      disabled