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

Conflicts:
	BoardConfig.mk

diff --cc BoardConfig.mk
index a963d14,304cb5b..4ec55e1
--- 1/BoardConfig.mk
--- 2/BoardConfig.mk
+++ b/BoardConfig.mk
@@@ -12,25 -10,14 +10,13 @@@ TARGET_ARCH_VARIANT := x86_6
  
  TARGET_2ND_CPU_ABI := x86
  TARGET_2ND_ARCH := x86
 -TARGET_2ND_ARCH_VARIANT := x86
 +TARGET_2ND_ARCH_VARIANT := x86_64
  
- TARGET_USES_64_BIT_BINDER := true
+ TARGET_CPU_ABI_LIST_64_BIT := $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2) $(NATIVE_BRIDGE_ABI_LIST_64_BIT)
+ TARGET_CPU_ABI_LIST_32_BIT := $(TARGET_2ND_CPU_ABI) $(TARGET_2ND_CPU_ABI2) $(NATIVE_BRIDGE_ABI_LIST_32_BIT)
+ TARGET_CPU_ABI_LIST := $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2) $(TARGET_2ND_CPU_ABI) $(TARGET_2ND_CPU_ABI2) $(NATIVE_BRIDGE_ABI_LIST_64_BIT) $(NATIVE_BRIDGE_ABI_LIST_32_BIT)
  
- SMALLER_FONT_FOOTPRINT := true
- MINIMAL_FONT_FOOTPRINT := true
- # Disable emulator for "make dist" until there is a 64-bit qemu kernel
- BUILD_EMULATOR := false
- # Some framework code requires this to enable BT
- BOARD_HAVE_BLUETOOTH := true
- BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/generic/common/bluetooth
- 
- USE_OPENGL_RENDERER := true
- 
- BOARD_USE_LEGACY_UI := true
- 
- # PDK does not use ext4 image, but it is added here to prevent build break.
  TARGET_USERIMAGES_USE_EXT4 := true
- BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
  BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
  BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
  BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4