Merge 96bff3bdda1b9fd18fc16f674aed4fcfe0488893 on remote branch

Change-Id: Icfb75dbcdbb98182c746adbe503a90b5596fa827
diff --git a/Android.mk b/Android.mk
index 32c315c..215706c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,7 +1,6 @@
 ifeq ($(AB_OTA_UPDATER),true)
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
-LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/gpt-utils/inc
 LOCAL_CFLAGS += -Wall -Werror
 LOCAL_SHARED_LIBRARIES += liblog librecovery_updater_msm libcutils
 LOCAL_HEADER_LIBRARIES += libhardware_headers
@@ -13,7 +12,6 @@
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/gpt-utils/inc
 LOCAL_CFLAGS += -Wall -Werror
 LOCAL_SHARED_LIBRARIES += liblog librecovery_updater_msm libcutils
 LOCAL_HEADER_LIBRARIES := libhardware_headers