display: Makefile fixes

* Add dependencies in gpu tonemapper
* Fix compile for hwc1 and gralloc1

CRs-Fixed: 2027609
Change-Id: I0f4303d8ea85d93be753e0031bcc3447ba407824
diff --git a/libgralloc/Android.mk b/libgralloc/Android.mk
index 8d5dfd3..b911999 100644
--- a/libgralloc/Android.mk
+++ b/libgralloc/Android.mk
@@ -27,6 +27,7 @@
 LOCAL_MODULE_RELATIVE_PATH    := hw
 LOCAL_MODULE_TAGS             := optional
 LOCAL_C_INCLUDES              := $(common_includes) $(kernel_includes)
+LOCAL_HEADER_LIBRARIES        := display_headers
 LOCAL_SHARED_LIBRARIES        := $(common_libs) libmemalloc libqdMetaData libqdutils
 ifneq ($(TARGET_IS_HEADLESS), true)
 LOCAL_SHARED_LIBRARIES        += libGLESv1_CM libdrmutils
@@ -51,6 +52,7 @@
 
 LOCAL_MODULE_TAGS             := optional
 LOCAL_C_INCLUDES              := $(common_includes) $(kernel_includes)
+LOCAL_HEADER_LIBRARIES        := display_headers
 LOCAL_SHARED_LIBRARIES        := $(common_libs) libqdutils libdl
 LOCAL_CFLAGS                  := $(common_flags) -DLOG_TAG=\"qdmemalloc\" -Wno-sign-conversion
 LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)