Extend test infrastructure to test JDK 17

Change-Id: I6c15a21ef2ac8ccff65ff82738c02adc38479672
diff --git a/tools/test.py b/tools/test.py
index 570da44..a2a1ba7 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -359,10 +359,8 @@
     gradle_args.append('-Ptesting-state-name=' + options.testing_state_name)
 
   # 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')
+  gradle_args.append('r8WithRelocatedDeps17')
 
   # Add Gradle tasks
   gradle_args.append('cleanTest')