Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86

Conflicts:
	BoardConfig.mk
	packages.mk

diff --cc BoardConfig.mk
index dbf2777,3af2dd3..2d99748
--- 1/BoardConfig.mk
--- 2/BoardConfig.mk
+++ b/BoardConfig.mk
@@@ -74,4 -77,8 +74,8 @@@ TARGET_HARDWARE_3D := tru
  BOARD_EGL_CFG ?= device/generic/common/gpu/egl_mesa.cfg
  endif
  
 -BOARD_KERNEL_CMDLINE := root=/dev/ram0 androidboot.hardware=$(TARGET_PRODUCT)
 +BOARD_KERNEL_CMDLINE := root=/dev/ram0 androidboot.hardware=$(PRODUCT_RELEASE_NAME)
+ 
+ COMPATIBILITY_ENHANCEMENT_PACKAGE := true
+ PRC_COMPATIBILITY_PACKAGE := true
+ ZIP_OPTIMIZATION_NO_INTEGRITY := true

diff --cc nativebridge/bin/enable_nativebridge
Simple merge

diff --cc packages.mk
index e145ee2,0e1c611..f13b836
--- 1/packages.mk
--- 2/packages.mk
+++ b/packages.mk
@@@ -54,8 -67,12 +54,10 @@@ PRODUCT_PACKAGES += 
  
  PRODUCT_PACKAGES += \
      badblocks \
 -    e2fsck \
 -    fsck.exfat \
+     fsck.f2fs \
      mke2fs \
 -    make_f2fs \
      mkfs.exfat \
++    mkfs.f2fs \
      mkntfs \
      mount.exfat \
      ntfs-3g \