DO NOT MERGE Build fix

Change-Id: I5eddd68c653a8cd756daaf4e235692307f199d54
diff --git a/common/device-side/device-info/Android.mk b/common/device-side/device-info/Android.mk
index 9fca0d2..8c5052b 100644
--- a/common/device-side/device-info/Android.mk
+++ b/common/device-side/device-info/Android.mk
@@ -25,3 +25,5 @@
 LOCAL_SDK_VERSION := current
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))