Snap for 4507345 from df339e552868cf0133f156637c857c605fc5b75f to pi-release

Change-Id: I1b639d121645a0ae80330d617fd72340782c9308
diff --git a/tests/Android.mk b/tests/Android.mk
index 95ce8e9..fa14ca9 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -4,7 +4,7 @@
 # We only want this apk build for tests.
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base.stubs
 
 LOCAL_STATIC_JAVA_LIBRARIES := junit