Fixes test errors

 Bug: 3248213
 Fixes errors in the tests that were caused by missing files, proguard,
 and the refactor.

Change-Id: I503dfc7ee42d0173e3a5ad032f58a6f4f310588c
diff --git a/Android.mk b/Android.mk
index 2abde9b..a5a47b3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,7 +4,8 @@
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-        android-common
+        android-common \
+        guava
 
 LOCAL_SRC_FILES := \
         $(call all-java-files-under, src) \