Merge remote-tracking branch 'x86/nougat-x86' into cm-14.1-x86

diff --combined BoardConfig.mk
index 552e913,fef9278..9dd7703
--- 1/BoardConfig.mk
--- 2/BoardConfig.mk
+++ b/BoardConfig.mk
@@@ -60,16 -60,19 +60,16 @@@ USE_INTEL_OMX_COMPONENTS := tru
  USE_OPENGL_RENDERER := true
  NUM_FRAMEBUFFER_SURFACE_BUFFERS ?= 3
  BOARD_USES_DRM_HWCOMPOSER ?= true
 +BOARD_EGL_WORKAROUND_BUG_10194508 := true
  
  USE_CAMERA_STUB ?= false
  
 -SUPERUSER_EMBEDDED := true
 -SUPERUSER_PACKAGE_PREFIX := com.android.settings.cyanogenmod.superuser
 -
  # This enables the wpa wireless driver
 -BOARD_WPA_SUPPLICANT_DRIVER ?= NL80211
 -BOARD_WPA_SUPPLICANT_PRIVATE_LIB ?= private_lib_driver_cmd
 -WPA_SUPPLICANT_VERSION ?= VER_2_1_DEVEL
 -WIFI_DRIVER_MODULE_PATH ?= auto
 +BOARD_WPA_SUPPLICANT_DRIVER := NL80211
 +WPA_SUPPLICANT_VERSION := VER_2_1_DEVEL
 +WIFI_DRIVER_MODULE_NAME := brcmfmac
  
- BOARD_GPU_DRIVERS ?= i915 i965 nouveau r300g r600g radeonsi swrast virgl vmwgfx
+ BOARD_GPU_DRIVERS ?= i915 i965 nouveau r300g r600g radeonsi virgl vmwgfx
  ifneq ($(strip $(BOARD_GPU_DRIVERS)),)
  TARGET_HARDWARE_3D := true
  endif
@@@ -80,4 -83,3 +80,4 @@@ TARGET_KERNEL_DIFFCONFIG := device/gene
  COMPATIBILITY_ENHANCEMENT_PACKAGE := true
  PRC_COMPATIBILITY_PACKAGE := true
  ZIP_OPTIMIZATION_NO_INTEGRITY := true
 +INSTALL_PREFIX ?= cm-x86-14.0

diff --combined init.x86.rc
index 12678f7,bd6d033..738d98f
--- 1/init.x86.rc
--- 2/init.x86.rc
+++ b/init.x86.rc
@@@ -10,8 -10,6 +10,6 @@@ on early-ini
  #   export EGL_DRIVERS egl_dri2
  
  on init
-     symlink /sdcard /mnt/sdcard
-     symlink /sdcard /storage/sdcard0
  
  on fs
      mount_all /fstab.${ro.hardware}
@@@ -35,8 -33,6 +33,8 @@@ on boo
      setprop status.battery.level 5
      setprop status.battery.level_raw  50
      setprop status.battery.level_scale 9
 +    setprop wifi.interface "wlan0"
 +    setprop wlan.driver.status "ok"
  
      # merge from system.prop
      setprop ro.config.sync yes
@@@ -104,11 -100,7 +102,7 @@@ on property:debug.logcat=
      class_start debug
  
  on property:persist.sys.nativebridge=1
-     mkdir /data/arm 0775 system system
      start nativebridge
  
  on property:persist.sys.nativebridge=0
      stop nativebridge
- 
- on property:debug.egl.hw=0
-     setprop ro.kernel.qemu 1

diff --combined nativebridge/bin/enable_nativebridge
index 97274a8,0f8cd13..306de9d
--- 1/nativebridge/bin/enable_nativebridge
--- 2/nativebridge/bin/enable_nativebridge
+++ b/nativebridge/bin/enable_nativebridge
@@@ -6,35 -6,41 +6,41 @@@ houdini_bin=
  dest_dir=/system/lib$1/arm$1
  binfmt_misc_dir=/proc/sys/fs/binfmt_misc
  
- cd /data/arm
- if [ -e /system/lib$1/libhoudini.so ]; then
+ if [ -z "$1" ]; then
+       if [ "`uname -m`" = "x86_64" ]; then
+               v=7_y
+               url=http://goo.gl/SBU3is
+       else
+               v=7_x
+               url=http://goo.gl/0IJs40
+       fi
+ else
+       v=7_z
+       url=http://goo.gl/FDrxVN
+ fi
+ 
+ if [ -s /system/lib$1/libhoudini.so ]; then
        log -pi -thoudini "found /system/lib$1/libhoudini.so"
- elif [ -e /system/etc/houdini$1.sfs ]; then
-       busybox mount /system/etc/houdini$1.sfs $dest_dir
+ elif [ -e /system/etc/houdini$v.sfs ]; then
+       mount /system/etc/houdini$v.sfs $dest_dir
  else
        if mountpoint -q $dest_dir; then
                kill -9 `fuser -m $dest_dir`
                umount -f $dest_dir
        fi
-       while ! busybox mount houdini$1.sfs $dest_dir; do
+       mkdir -p /data/arm
+       cd /data/arm
+       while ! mount houdini$v.sfs $dest_dir; do
                while [ "$(getprop net.dns1)" = "" ]; do
                        sleep 10
                done
-               if [ -z "$1" ]; then
-                       [ "`uname -m`" = "x86_64" ] && url=http://goo.gl/Knnmyl || url=http://goo.gl/JsoX2C
-               else
-                       url=http://goo.gl/n6KtQa
-               fi
-               busybox wget $url -cO houdini$1.sfs && continue
-               rm -f houdini$1.sfs
 -              wget $url -cO houdini$v.sfs && continue
++              busybox wget $url -cO houdini$v.sfs && continue
+               rm -f houdini$v.sfs
                sleep 30
        done
  fi
  
- 
- # if you don't see the files 'register' and 'status' in /proc/sys/fs/binfmt_misc
- # then run the following command:
- # mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
+ [ -s /system/lib$1/libhoudini.so ] || mount --bind $dest_dir/libhoudini.so /system/lib$1/libhoudini.so
  
  # this is to add the supported binary formats via binfmt_misc