Snap for 4818534 from b9d9e99703d662976078887d105644ccd7d03759 to pi-release

Change-Id: Iadf379459c70607d02647f3287cba1e074c29d11
diff --git a/Android.mk b/Android.mk
index 12c2dee..cf89a91 100644
--- a/Android.mk
+++ b/Android.mk
@@ -36,6 +36,7 @@
 LOCAL_SRC_FILES := thermal-default.c
 endif
 
+LOCAL_HEADER_LIBRARIES := libutils_headers libhardware_headers
 LOCAL_SHARED_LIBRARIES := liblog libcutils
 LOCAL_HEADER_LIBRARIES := libhardware_headers
 LOCAL_MODULE_TAGS := optional