Merge "37742976 - Catch bad gifs"
diff --git a/tests/Android.mk b/tests/Android.mk
index a8c13cd..a137a92 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -30,8 +30,9 @@
 LOCAL_CERTIFICATE := platform
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    mockito-target \
-    legacy-android-test
+    mockito-target
+
+LOCAL_JAVA_LIBRARIES := android.test.mock.sdk legacy-android-test
 
 include $(BUILD_PACKAGE)