libdrmutils: Add support for RMFB2

Add support for RMFB2 if available. Original RMFB bypasses refcounting
in kernel and removes planes, crtcs etc associated with the FB Id.
RMFB2 has proper refcounting and allows buffer removal to be
independent of drawing thread in client

Change-Id: I4f2c9dc509844467f39be067697a46d1beeeaff7
CRs-fixed: 1114808
diff --git a/libdrmutils/Android.mk b/libdrmutils/Android.mk
index 8d9205d..15102e4 100644
--- a/libdrmutils/Android.mk
+++ b/libdrmutils/Android.mk
@@ -3,10 +3,10 @@
 
 LOCAL_MODULE                  := libdrmutils
 LOCAL_MODULE_TAGS             := optional
-LOCAL_C_INCLUDES              := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
-                                 external/libdrm
+LOCAL_C_INCLUDES              := external/libdrm \
+                                 $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 LOCAL_SHARED_LIBRARIES        := libdrm libdl
-LOCAL_CFLAGS                  := -DLOG_TAG=\"DRMUTILS\" -Wall -std=c++11 -Werror
+LOCAL_CFLAGS                  := -DLOG_TAG=\"DRMUTILS\" -Wall -std=c++11 -Werror -fno-operator-names
 LOCAL_CLANG                   := true
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 LOCAL_SRC_FILES               := drm_master.cpp drm_res_mgr.cpp drm_lib_loader.cpp