Snap for 4507345 from 99c4ffb039230cb1b822e07e50e8f38104ade4bd to pi-release

Change-Id: I1f8a6808ca759e2c6d18a6b8eb3c2053fbe6b11b
diff --git a/tests/robolectric/Android.mk b/tests/robolectric/Android.mk
index f9c6bf2..4b2c618 100644
--- a/tests/robolectric/Android.mk
+++ b/tests/robolectric/Android.mk
@@ -20,7 +20,8 @@
 LOCAL_JAVA_LIBRARIES := \
     junit \
     platform-robolectric-3.1.1-prebuilt \
-    sdk_vcurrent
+    sdk_vcurrent \
+    android.test.base
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-v7-preference \