Merge cc3a2077c74a483ebbdbeb84a6abae3991a357ec on remote branch

Change-Id: I5848d2416cb24a40c9ca34de98ca6f4cc8ed8118
diff --git a/dexlib2/Android.bp b/dexlib2/Android.bp
index c5b0ebd..4132d45 100644
--- a/dexlib2/Android.bp
+++ b/dexlib2/Android.bp
@@ -47,3 +47,21 @@
         "jsr305",
     ],
 }
+
+java_library_host {
+    name: "dexlib2-no-guava-no-cli",
+
+    srcs: [
+        "src/main/java/**/*.java",
+    ],
+
+    libs: [
+        "guava",
+        "commons-cli-1.2",
+    ],
+
+    static_libs: [
+        "jcommander",
+        "jsr305",
+    ],
+}
\ No newline at end of file