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

diff --cc BoardConfig.mk
index b21c975,4f7afb2..09e5bbf
--- 1/BoardConfig.mk
--- 2/BoardConfig.mk
+++ b/BoardConfig.mk
@@@ -60,8 -60,8 +60,9 @@@ 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
  

diff --cc init.x86.rc
Simple merge