zenfone6: It's Q time

Change-Id: Icb2104ca2bda524e7fc3c7ee9a69e2b0dc8c1abc
diff --git a/gpt-utils/Android.mk b/gpt-utils/Android.mk
index 7d8f6d9..a9b3176 100644
--- a/gpt-utils/Android.mk
+++ b/gpt-utils/Android.mk
@@ -3,18 +3,18 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := bootable/recovery \
-                    $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
+                    generated_kernel_headers
 LOCAL_SRC_FILES := gpt-utils.cpp sparse_crc32.cpp
-LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 LOCAL_MODULE := libgptutils
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := bootable/recovery \
-                    $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
+                    generated_kernel_headers
 LOCAL_SRC_FILES := gpt-utils.cpp sparse_crc32.cpp
-LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 LOCAL_SHARED_LIBRARIES += liblog libcutils
 LOCAL_MODULE := libgptutils
 LOCAL_COPY_HEADERS_TO := gpt-utils/inc