display: Makefile fixes

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

CRs-Fixed: 2027609
Change-Id: I0f4303d8ea85d93be753e0031bcc3447ba407824
diff --git a/gpu_tonemapper/Android.mk b/gpu_tonemapper/Android.mk
index 2d10319..6af401e 100644
--- a/gpu_tonemapper/Android.mk
+++ b/gpu_tonemapper/Android.mk
@@ -18,6 +18,7 @@
 LOCAL_C_INCLUDES          := $(TARGET_OUT_HEADERS)/qcom/display/
 LOCAL_C_INCLUDES          += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 LOCAL_SHARED_LIBRARIES    := libEGL libGLESv2 libui libutils liblog
+LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
 
 LOCAL_CFLAGS              := $(version_flag) -Wno-missing-field-initializers -Wall \
                              -Wno-unused-parameter -std=c++11 -DLOG_TAG=\"GPU_TONEMAPPER\"