Reland "Clean-up top-level r8 entry-points to not use shadow-jar"

This reverts commit 9957518b7c781235baba52c229c77e5bd6c548ab.

Change-Id: Ib01490901c0cb0f0b9b04806df61f2d919d6881a
diff --git a/tools/test.py b/tools/test.py
index a75beb4..d6e4983 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -240,6 +240,8 @@
     gradle_args.append('--no-daemon')
 
   # Build an R8 with dependencies for bootstrapping tests before adding test sources.
+  gradle_args.append('r8WithDeps')
+  gradle_args.append('r8WithDeps11')
   gradle_args.append('r8WithRelocatedDeps')
   gradle_args.append('r8WithRelocatedDeps11')