Merge remote-tracking branch 'x86/lollipop-x86' into marshmallow-x86

Conflicts:
	BoardConfig.mk

diff --cc BoardConfig.mk
index 042ad72,804ba77..1f19cec
--- 1/BoardConfig.mk
--- 2/BoardConfig.mk
+++ b/BoardConfig.mk
@@@ -7,27 -7,12 +7,11 @@@ TARGET_NO_BOOTLOADER := tru
  
  TARGET_ARCH := x86
  TARGET_CPU_ABI := x86
 -TARGET_CPU_SMP := true
  
- SMALLER_FONT_FOOTPRINT := true
- MINIMAL_FONT_FOOTPRINT := true
- # Some framework code requires this to enable BT
- BOARD_HAVE_BLUETOOTH := true
- BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/generic/common/bluetooth
+ TARGET_CPU_ABI_LIST_32_BIT := $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2) $(NATIVE_BRIDGE_ABI_LIST_32_BIT)
+ TARGET_CPU_ABI_LIST := $(TARGET_CPU_ABI_LIST_32_BIT)
  
- # Build OpenGLES emulation libraries
- BUILD_EMULATOR_OPENGL := true
- BUILD_EMULATOR_OPENGL_DRIVER := true
- USE_OPENGL_RENDERER := true
- 
- BOARD_USE_LEGACY_UI := true
- 
- # share the same one across all mini-emulators
- BOARD_EGL_CFG := device/generic/goldfish/opengl/system/egl/egl.cfg
- 
- # PDK does not use ext4 image, but it is added here to prevent build break.
  TARGET_USERIMAGES_USE_EXT4 := true
- BOARD_SYSTEMIMAGE_PARTITION_SIZE := 576716800
  BOARD_USERDATAIMAGE_PARTITION_SIZE := 419430400
  BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
  BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
@@@ -36,3 -21,20 +20,5 @@@ TARGET_USERIMAGES_SPARSE_EXT_DISABLED :
  
  BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy
  BOARD_SEPOLICY_DIRS += build/target/board/generic_x86/sepolicy
 -BOARD_SEPOLICY_UNION += \
 -        bootanim.te \
 -        device.te \
 -        domain.te \
 -        file.te \
 -        file_contexts \
 -        healthd.te \
 -        installd.te \
 -        qemud.te \
 -        rild.te \
 -        shell.te \
 -        surfaceflinger.te \
 -        system_server.te \
 -        zygote.te
 -
+ 
+ include device/generic/common/BoardConfig.mk