diff --git a/DEPS b/DEPS
index 2396f98..95fb2a0 100644
--- a/DEPS
+++ b/DEPS
@@ -87,9 +87,6 @@
   # Checkout Android dependencies only on platforms where we build for Android targets.
   'download_android_deps': 'host_os == "mac" or (host_os == "linux" and host_cpu == "x64")',
 
-  # Checkout Java dependencies only on platforms that do not have java installed on path.
-  'download_jdk': True,
-
   # Checkout Windows dependencies only if we are building on Windows.
   'download_windows_deps' : 'host_os == "win"',
 
diff --git a/engine/src/flutter/ci/builders/linux_arm_host_desktop_engine.json b/engine/src/flutter/ci/builders/linux_arm_host_desktop_engine.json
index 0bd5dd5..7c03a7f 100644
--- a/engine/src/flutter/ci/builders/linux_arm_host_desktop_engine.json
+++ b/engine/src/flutter/ci/builders/linux_arm_host_desktop_engine.json
@@ -29,7 +29,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -72,7 +71,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -115,7 +113,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
diff --git a/engine/src/flutter/ci/builders/linux_arm_host_engine.json b/engine/src/flutter/ci/builders/linux_arm_host_engine.json
index 30c551b..8465a63 100644
--- a/engine/src/flutter/ci/builders/linux_arm_host_engine.json
+++ b/engine/src/flutter/ci/builders/linux_arm_host_engine.json
@@ -33,7 +33,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
diff --git a/engine/src/flutter/ci/builders/linux_clang_tidy.json b/engine/src/flutter/ci/builders/linux_clang_tidy.json
index 78908ad..a980346 100644
--- a/engine/src/flutter/ci/builders/linux_clang_tidy.json
+++ b/engine/src/flutter/ci/builders/linux_clang_tidy.json
@@ -61,8 +61,7 @@
                 "cores=32"
             ],
             "gclient_variables": {
-                "download_android_deps": false,
-                "download_jdk": false
+                "download_android_deps": false
             },
             "dependencies": [
                 "ci/host_debug_clang_tidy"
@@ -91,8 +90,7 @@
                 "cores=32"
             ],
             "gclient_variables": {
-                "download_android_deps": false,
-                "download_jdk": false
+                "download_android_deps": false
             },
             "dependencies": [
                 "ci/host_debug_clang_tidy"
@@ -121,8 +119,7 @@
                 "cores=32"
             ],
             "gclient_variables": {
-                "download_android_deps": false,
-                "download_jdk": false
+                "download_android_deps": false
             },
             "dependencies": [
                 "ci/host_debug_clang_tidy"
@@ -151,8 +148,7 @@
                 "cores=32"
             ],
             "gclient_variables": {
-                "download_android_deps": false,
-                "download_jdk": false
+                "download_android_deps": false
             },
             "dependencies": [
                 "ci/host_debug_clang_tidy"
diff --git a/engine/src/flutter/ci/builders/linux_fuchsia.json b/engine/src/flutter/ci/builders/linux_fuchsia.json
index 1a5856c..b4a43e2 100644
--- a/engine/src/flutter/ci/builders/linux_fuchsia.json
+++ b/engine/src/flutter/ci/builders/linux_fuchsia.json
@@ -18,7 +18,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -48,7 +47,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -78,7 +76,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -124,7 +121,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -154,7 +150,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "run_fuchsia_emu": true,
                 "use_rbe": true
             },
@@ -185,7 +180,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "run_fuchsia_emu": true,
                 "use_rbe": true
             },
diff --git a/engine/src/flutter/ci/builders/linux_host_desktop_engine.json b/engine/src/flutter/ci/builders/linux_host_desktop_engine.json
index adf1f26..6bed87d 100644
--- a/engine/src/flutter/ci/builders/linux_host_desktop_engine.json
+++ b/engine/src/flutter/ci/builders/linux_host_desktop_engine.json
@@ -29,7 +29,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -70,7 +69,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -111,7 +109,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
diff --git a/engine/src/flutter/ci/builders/linux_host_engine.json b/engine/src/flutter/ci/builders/linux_host_engine.json
index 5c1a5a0..f055d1e 100644
--- a/engine/src/flutter/ci/builders/linux_host_engine.json
+++ b/engine/src/flutter/ci/builders/linux_host_engine.json
@@ -34,7 +34,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -85,7 +84,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
diff --git a/engine/src/flutter/ci/builders/linux_host_engine_ddm.json b/engine/src/flutter/ci/builders/linux_host_engine_ddm.json
index fe403f1..d6833c2 100644
--- a/engine/src/flutter/ci/builders/linux_host_engine_ddm.json
+++ b/engine/src/flutter/ci/builders/linux_host_engine_ddm.json
@@ -29,7 +29,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
diff --git a/engine/src/flutter/ci/builders/linux_host_engine_test.json b/engine/src/flutter/ci/builders/linux_host_engine_test.json
index 41d3d46..1224bec 100644
--- a/engine/src/flutter/ci/builders/linux_host_engine_test.json
+++ b/engine/src/flutter/ci/builders/linux_host_engine_test.json
@@ -11,7 +11,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -58,7 +57,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -111,7 +109,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
diff --git a/engine/src/flutter/ci/builders/linux_unopt.json b/engine/src/flutter/ci/builders/linux_unopt.json
index 59ba15e..12705c3 100644
--- a/engine/src/flutter/ci/builders/linux_unopt.json
+++ b/engine/src/flutter/ci/builders/linux_unopt.json
@@ -113,7 +113,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -357,7 +356,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
diff --git a/engine/src/flutter/ci/builders/linux_web_engine_build.json b/engine/src/flutter/ci/builders/linux_web_engine_build.json
index c02a5aa..b7b2f4b 100644
--- a/engine/src/flutter/ci/builders/linux_web_engine_build.json
+++ b/engine/src/flutter/ci/builders/linux_web_engine_build.json
@@ -20,7 +20,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "download_emsdk": true
       },
       "gn": [
diff --git a/engine/src/flutter/ci/builders/linux_web_engine_test.json b/engine/src/flutter/ci/builders/linux_web_engine_test.json
index 906fe1a..1ce76a9 100644
--- a/engine/src/flutter/ci/builders/linux_web_engine_test.json
+++ b/engine/src/flutter/ci/builders/linux_web_engine_test.json
@@ -205,8 +205,7 @@
         "os=Linux"
       ],
       "gclient_variables": {
-        "download_android_deps": false,
-        "download_jdk": false
+        "download_android_deps": false
       },
       "dependencies": [
         "web_tests/test_bundles/dart2js-canvaskit-webparagraph",
@@ -407,8 +406,7 @@
         "os=Linux"
       ],
       "gclient_variables": {
-        "download_android_deps": false,
-        "download_jdk": false
+        "download_android_deps": false
       },
       "dependencies": [
         "web_tests/test_bundles/dart2js-canvaskit-engine",
@@ -529,8 +527,7 @@
         "cpu=arm64"
       ],
       "gclient_variables": {
-        "download_android_deps": false,
-        "download_jdk": false
+        "download_android_deps": false
       },
       "dependencies": [
         "web_tests/test_bundles/dart2js-canvaskit-engine",
diff --git a/engine/src/flutter/ci/builders/local_engine.json b/engine/src/flutter/ci/builders/local_engine.json
index 7d27bbb..04d1062 100644
--- a/engine/src/flutter/ci/builders/local_engine.json
+++ b/engine/src/flutter/ci/builders/local_engine.json
@@ -8,7 +8,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -41,7 +40,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -75,7 +73,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -108,7 +105,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -141,7 +137,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -175,7 +170,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -609,7 +603,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -641,7 +634,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -674,7 +666,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -707,7 +698,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -740,7 +730,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -766,7 +755,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -793,7 +781,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -819,7 +806,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -846,7 +832,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -878,7 +863,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -904,7 +888,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -930,7 +913,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -962,7 +944,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -989,7 +970,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -1016,7 +996,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "download_emsdk": true
       },
       "gn": [
@@ -1041,7 +1020,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "download_emsdk": true
       },
       "gn": [
@@ -1068,7 +1046,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "download_emsdk": true
       },
       "dependencies": [
@@ -1105,7 +1082,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "download_emsdk": true
       },
       "dependencies": [
diff --git a/engine/src/flutter/ci/builders/mac_android_aot_engine.json b/engine/src/flutter/ci/builders/mac_android_aot_engine.json
index 86170d5..8515aeb 100644
--- a/engine/src/flutter/ci/builders/mac_android_aot_engine.json
+++ b/engine/src/flutter/ci/builders/mac_android_aot_engine.json
@@ -30,7 +30,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -88,7 +87,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -148,7 +146,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -208,7 +205,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -266,7 +262,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -326,7 +321,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
diff --git a/engine/src/flutter/ci/builders/mac_clang_tidy.json b/engine/src/flutter/ci/builders/mac_clang_tidy.json
index 83b4557..eea18af 100644
--- a/engine/src/flutter/ci/builders/mac_clang_tidy.json
+++ b/engine/src/flutter/ci/builders/mac_clang_tidy.json
@@ -8,7 +8,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -41,7 +40,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -79,7 +77,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "dependencies": [
@@ -134,7 +131,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "dependencies": [
@@ -189,7 +185,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "dependencies": [
@@ -244,7 +239,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "dependencies": [
@@ -299,7 +293,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "dependencies": [
diff --git a/engine/src/flutter/ci/builders/mac_host_engine.json b/engine/src/flutter/ci/builders/mac_host_engine.json
index 37af67d..f7e48f0 100644
--- a/engine/src/flutter/ci/builders/mac_host_engine.json
+++ b/engine/src/flutter/ci/builders/mac_host_engine.json
@@ -22,7 +22,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -89,7 +88,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -145,7 +143,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -210,7 +207,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -261,7 +257,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -312,7 +307,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -375,7 +369,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -429,7 +422,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -482,7 +474,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -548,7 +539,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -605,7 +595,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -661,7 +650,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -727,7 +715,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -782,7 +769,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -837,7 +823,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -904,7 +889,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -962,7 +946,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -1019,7 +1002,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
diff --git a/engine/src/flutter/ci/builders/mac_ios_engine.json b/engine/src/flutter/ci/builders/mac_ios_engine.json
index 770ab69..d4ef6ca 100644
--- a/engine/src/flutter/ci/builders/mac_ios_engine.json
+++ b/engine/src/flutter/ci/builders/mac_ios_engine.json
@@ -19,7 +19,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -66,7 +65,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -115,7 +113,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -162,7 +159,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -209,7 +205,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -256,7 +251,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -305,7 +299,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -356,7 +349,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -405,7 +397,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -454,7 +445,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
diff --git a/engine/src/flutter/ci/builders/mac_ios_engine_ddm.json b/engine/src/flutter/ci/builders/mac_ios_engine_ddm.json
index f772e92..c94a4a4 100644
--- a/engine/src/flutter/ci/builders/mac_ios_engine_ddm.json
+++ b/engine/src/flutter/ci/builders/mac_ios_engine_ddm.json
@@ -19,7 +19,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -68,7 +67,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -119,7 +117,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
@@ -168,7 +165,6 @@
       ],
       "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
       },
       "gn": [
diff --git a/engine/src/flutter/ci/builders/mac_unopt.json b/engine/src/flutter/ci/builders/mac_unopt.json
index d8ca004..4d45bda 100644
--- a/engine/src/flutter/ci/builders/mac_unopt.json
+++ b/engine/src/flutter/ci/builders/mac_unopt.json
@@ -9,7 +9,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -272,7 +271,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
diff --git a/engine/src/flutter/ci/builders/standalone/linux_benchmarks.json b/engine/src/flutter/ci/builders/standalone/linux_benchmarks.json
index d077c6e..9d80faa 100644
--- a/engine/src/flutter/ci/builders/standalone/linux_benchmarks.json
+++ b/engine/src/flutter/ci/builders/standalone/linux_benchmarks.json
@@ -5,7 +5,6 @@
     ],
     "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
     },
     "gn": [
diff --git a/engine/src/flutter/ci/builders/standalone/windows_unopt.json b/engine/src/flutter/ci/builders/standalone/windows_unopt.json
index 720bba7..5a4d2c2 100644
--- a/engine/src/flutter/ci/builders/standalone/windows_unopt.json
+++ b/engine/src/flutter/ci/builders/standalone/windows_unopt.json
@@ -5,7 +5,6 @@
     ],
     "gclient_variables": {
         "download_android_deps": false,
-        "download_jdk": false,
         "use_rbe": true
     },
     "dependencies": [
diff --git a/engine/src/flutter/ci/builders/windows_arm_host_engine.json b/engine/src/flutter/ci/builders/windows_arm_host_engine.json
index 2031e1d..f86deb7 100644
--- a/engine/src/flutter/ci/builders/windows_arm_host_engine.json
+++ b/engine/src/flutter/ci/builders/windows_arm_host_engine.json
@@ -27,7 +27,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -74,7 +73,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -117,7 +115,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "generators": {},
diff --git a/engine/src/flutter/ci/builders/windows_host_engine.json b/engine/src/flutter/ci/builders/windows_host_engine.json
index ae9d426..a227043 100644
--- a/engine/src/flutter/ci/builders/windows_host_engine.json
+++ b/engine/src/flutter/ci/builders/windows_host_engine.json
@@ -35,7 +35,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -80,7 +79,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [
@@ -121,7 +119,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "generators": {},
diff --git a/engine/src/flutter/ci/builders/windows_host_engine_test.json b/engine/src/flutter/ci/builders/windows_host_engine_test.json
index 84b40d3..52c7647 100644
--- a/engine/src/flutter/ci/builders/windows_host_engine_test.json
+++ b/engine/src/flutter/ci/builders/windows_host_engine_test.json
@@ -11,7 +11,6 @@
             ],
             "gclient_variables": {
                 "download_android_deps": false,
-                "download_jdk": false,
                 "use_rbe": true
             },
             "gn": [