Revert "Cleanup r8-wip-dev r8 dependencies."

This reverts commit 0326d86a6e0a6179ea6cd72353f6f051efccd894.

Reason for revert: master branch is unused and has old sources that do not work with this change.

Change-Id: Iff0db81f1efd241794a5df5b3fa90f8ffb06857f
diff --git a/Android.bp b/Android.bp
index 0f13746..808cd95 100644
--- a/Android.bp
+++ b/Android.bp
@@ -34,8 +34,8 @@
         "deps/asm-commons-6.0.jar",
         "deps/asm-tree-6.0.jar",
         "deps/asm-util-6.0.jar",
+        "deps/commons-compress-1.12.jar",
         "deps/fastutil-7.2.0.jar",
-        "deps/gson-2.7.jar",
         "deps/jopt-simple-4.6.jar",
         "deps/json-simple-1.1.1.jar",
         "deps/guava-23.0.jar",
diff --git a/deps/commons-compress-1.12.jar b/deps/commons-compress-1.12.jar
new file mode 100644
index 0000000..4867705
--- /dev/null
+++ b/deps/commons-compress-1.12.jar
Binary files differ
diff --git a/deps/gson-2.7.jar b/deps/gson-2.7.jar
deleted file mode 100644
index be5b59b..0000000
--- a/deps/gson-2.7.jar
+++ /dev/null
Binary files differ