Merge "DO NOT MERGE Fix build failure due to missing guava target" into nyc-mr2-dev-plus-aosp
diff --git a/tests/app/Android.mk b/tests/app/Android.mk
index c0c0ccf..f2dc5d4 100644
--- a/tests/app/Android.mk
+++ b/tests/app/Android.mk
@@ -9,6 +9,7 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
+    guava \
     mockito-target \
     espresso-core \
     espresso-contrib-nodep \