Merge "Add a host-only build module for guava-testlib" am: 63c7741c50 am: 76e1cfd9dd am: a468927028 am: 5c5395a84a

Change-Id: Ibe15c9ebf55698713236ce1da81b052823247488
diff --git a/Android.bp b/Android.bp
index 52ae704..71dbc4b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -55,6 +55,19 @@
     java_version: "1.8",
 }
 
+java_library_host {
+    name: "guava-testlib",
+    srcs: ["guava-testlib/src/**/*.java"],
+    libs: [
+         "error_prone_annotations",
+         "guava",
+         "guava-android-annotation-stubs",
+         "jsr305",
+         "junit",
+    ],
+    java_version: "1.8",
+}
+
 // Guava for Android can't compile against an Android bootclasspath, compile
 // it for the host and then use it on the device.  It uses reflection to
 // prevent calling into methods that don't exist on Android.