Merge remote-tracking branch 'origin/master' into nougat-x86

diff --cc Android.mk
index 14d0b58,d93c06d..5fc8266
--- 1/Android.mk
--- 2/Android.mk
+++ b/Android.mk
@@@ -37,4 -37,17 +37,6 @@@ LOCAL_EXPORT_C_INCLUDE_DIRS := 
  LOCAL_MODULE := gralloc.gbm
  LOCAL_MODULE_TAGS := optional
  LOCAL_MODULE_RELATIVE_PATH := hw
+ LOCAL_PROPRIETARY_MODULE := true
+ 
  include $(BUILD_SHARED_LIBRARY)
 -
 -include $(CLEAR_VARS)
 -
 -LOCAL_EXPORT_C_INCLUDE_DIRS := \
 -      $(LOCAL_PATH)
 -
 -LOCAL_MODULE := libgralloc_drm
 -LOCAL_MODULE_TAGS := optional
 -LOCAL_PROPRIETARY_MODULE := true
 -
 -include $(BUILD_SHARED_LIBRARY)

diff --cc gralloc_drm_handle.h
Simple merge