diff --git a/common/tests/Android.mk b/common/tests/Android.mk
index 58ba01b..42ea168 100644
--- a/common/tests/Android.mk
+++ b/common/tests/Android.mk
@@ -16,7 +16,7 @@
 
 include $(CLEAR_VARS)
 LOCAL_CERTIFICATE := platform
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
 LOCAL_MODULE_TAGS := tests
 LOCAL_PACKAGE_NAME := AndroidCommonTests
 LOCAL_SDK_VERSION := 8
diff --git a/framesequence/Android.mk b/framesequence/Android.mk
index 1b3cf2d..dbe47ea 100644
--- a/framesequence/Android.mk
+++ b/framesequence/Android.mk
@@ -25,4 +25,4 @@
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
-include $(call all-makefiles-under, $(LOCAL_PATH))
+include $(call first-makefiles-under, $(LOCAL_PATH))