Merge "Improve Mockito 2.7.13 compatibility classes"
diff --git a/Android.mk b/Android.mk
index afc1ede..ce5294b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -118,3 +118,5 @@
 ###################################################
 explicit_target_excludes :=
 target_src_files :=
+
+include $(call all-makefiles-under,$(LOCAL_PATH))