Snap for 9349486 from a246c64df17af711118875bb5c868a622c0e05b7 to udc-d1-release

Change-Id: Ifcb5e630129571b3464cc33ec387ad21dbe1063d
diff --git a/Android.mk b/Android.mk
index 4e1ebf4..99e2272 100644
--- a/Android.mk
+++ b/Android.mk
@@ -77,6 +77,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, $(BASE_DIR))
 LOCAL_SRC_FILES += $(call all-proto-files-under, $(BASE_DIR))
 LOCAL_SRC_FILES += $(call all-Iaidl-files-under, $(BASE_DIR))
+LOCAL_AIDL_INCLUDES :=  $(LOCAL_PATH)/java/
 LOCAL_SRC_FILES := $(filter-out $(EXCLUDE_FILES),$(LOCAL_SRC_FILES))
 
 LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)