ril: fix libril if we don't overwrite the header in our device tree

Change-Id: Ic580b80b28c738828f4c19aeb54421d9f98c7d40
diff --git a/ril/libril/Android.mk b/ril/libril/Android.mk
index c5e1c5e..412a854 100644
--- a/ril/libril/Android.mk
+++ b/ril/libril/Android.mk
@@ -36,6 +36,7 @@
 LOCAL_CFLAGS += -DNEEDS_VIDEO_CALL_FIELD
 endif
 
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
 LOCAL_C_INCLUDES += $(TARGET_OUT_HEADER)/librilutils
 LOCAL_C_INCLUDES += external/nanopb-c
 
diff --git a/ril/include/telephony/ril_commands_vendor.h b/ril/libril/include/telephony/ril_commands_vendor.h
similarity index 100%
rename from ril/include/telephony/ril_commands_vendor.h
rename to ril/libril/include/telephony/ril_commands_vendor.h
diff --git a/ril/include/telephony/ril_unsol_commands_vendor.h b/ril/libril/include/telephony/ril_unsol_commands_vendor.h
similarity index 100%
rename from ril/include/telephony/ril_unsol_commands_vendor.h
rename to ril/libril/include/telephony/ril_unsol_commands_vendor.h