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

diff --combined BoardConfig.mk
index b21c975,4f7afb2..09e5bbf
--- 1/BoardConfig.mk
--- 2/BoardConfig.mk
+++ b/BoardConfig.mk
@@@ -19,8 -19,8 +19,8 @@@ BOARD_MALLOC_ALIGNMENT := 1
  # Enable dex-preoptimization to speed up the first boot sequence
  # of an SDK AVD. Note that this operation only works on Linux for now
  ifeq ($(HOST_OS),linux)
 -WITH_DEXPREOPT := true
 -WITH_DEXPREOPT_PIC := true
 +WITH_DEXPREOPT := false
 +WITH_DEXPREOPT_PIC := false
  endif
  
  # the following variables could be overridden
@@@ -60,15 -60,19 +60,16 @@@ USE_INTEL_OMX_COMPONENTS := tru
  
  USE_OPENGL_RENDERER := true
  NUM_FRAMEBUFFER_SURFACE_BUFFERS ?= 3
+ BOARD_USES_DRM_GRALLOC := true
  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 virgl vmwgfx
  ifneq ($(strip $(BOARD_GPU_DRIVERS)),)
@@@ -81,9 -85,3 +82,9 @@@ TARGET_KERNEL_DIFFCONFIG := device/gene
  COMPATIBILITY_ENHANCEMENT_PACKAGE := true
  PRC_COMPATIBILITY_PACKAGE := true
  ZIP_OPTIMIZATION_NO_INTEGRITY := true
 +
 +# LineageOS specific
 +VER := 14.1-r3
 +RELEASE_OS_TITLE := LineageOS
 +BUILD_NAME_VARIANT := cm-x86
 +INSTALL_PREFIX := cm-x86-$(VER)

diff --combined init.x86.rc
index eca25ae,03727f3..2815562
--- 1/init.x86.rc
--- 2/init.x86.rc
+++ b/init.x86.rc
@@@ -9,6 -9,8 +9,8 @@@ on early-ini
      export EGL_LOG_LEVEL info
  #   export EGL_DRIVERS egl_dri2
  
+     exec u:r:init:s0 -- /sbin/modprobe sdcardfs
+ 
  on init
  
  on fs
@@@ -34,8 -36,6 +36,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