DO NOT MERGE

Merge pie-platform-release (PPRL.181205.001, history only) into master

Bug: 120502534
Change-Id: I452ef1f6a8603ff88e87f67b41fae2f84bf62798
diff --git a/dexlib2/Android.bp b/dexlib2/Android.bp
index e9fab20..6d3769b 100644
--- a/dexlib2/Android.bp
+++ b/dexlib2/Android.bp
@@ -30,3 +30,22 @@
         "smali-util",
     ],
 }
+
+java_library_host {
+    name: "dexlib2-no-guava",
+
+    srcs: [
+        "src/main/java/**/*.java",
+    ],
+
+    libs: [
+        "guava",
+    ],
+
+    static_libs: [
+        "commons-cli-1.2",
+        "jcommander",
+        "jsr305",
+        "smali-util",
+    ],
+}