Use guava from the tree am: 23316ef610
am: dca05ffd5d

Change-Id: I890c6463b019bf73beec7ec52fb65541fa7dbc09
diff --git a/Android.bp b/Android.bp
index a7b9442..8a1af22 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,7 +25,7 @@
     manifest: "manifest.txt",
     static_libs: [
         "error_prone_annotations",
-        "guava-21.0",
+        "guava",
     ],
 
     plugins: ["dagger2-auto-value"],