diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json
index 1787f878fd..be876a1cc5 100644
--- a/infra/specs/client.webrtc.json
+++ b/infra/specs/client.webrtc.json
@@ -1278,46 +1278,6 @@
       }
     ]
   },
-  "Android32 Builder arm64": {
-    "gtest_tests": [
-      {
-        "args": [
-          "--android",
-          "--adb-path",
-          "../../third_party/android_sdk/public/platform-tools/adb"
-        ],
-        "merge": {
-          "args": [
-            "--test-suite",
-            "low_bandwidth_audio_perf_test"
-          ],
-          "script": "//tools_webrtc/perf/process_perf_results_py2.py"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "low_bandwidth_audio_perf_test",
-        "test_id_prefix": "ninja://audio:low_bandwidth_audio_perf_test/"
-      },
-      {
-        "args": [
-          "--nologs"
-        ],
-        "merge": {
-          "args": [
-            "--test-suite",
-            "webrtc_perf_tests"
-          ],
-          "script": "//tools_webrtc/perf/process_perf_results_py2.py"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "webrtc_perf_tests",
-        "test_id_prefix": "ninja://:webrtc_perf_tests/"
-      }
-    ]
-  },
   "Android32 Builder x86": {},
   "Android32 Builder x86 (dbg)": {},
   "Android64 (M Nexus5X)": {
@@ -2522,6 +2482,46 @@
       }
     ]
   },
+  "Android64 Builder arm64": {
+    "gtest_tests": [
+      {
+        "args": [
+          "--android",
+          "--adb-path",
+          "../../third_party/android_sdk/public/platform-tools/adb"
+        ],
+        "merge": {
+          "args": [
+            "--test-suite",
+            "low_bandwidth_audio_perf_test"
+          ],
+          "script": "//tools_webrtc/perf/process_perf_results_py2.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "low_bandwidth_audio_perf_test",
+        "test_id_prefix": "ninja://audio:low_bandwidth_audio_perf_test/"
+      },
+      {
+        "args": [
+          "--nologs"
+        ],
+        "merge": {
+          "args": [
+            "--test-suite",
+            "webrtc_perf_tests"
+          ],
+          "script": "//tools_webrtc/perf/process_perf_results_py2.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "webrtc_perf_tests",
+        "test_id_prefix": "ninja://:webrtc_perf_tests/"
+      }
+    ]
+  },
   "Android64 Builder x64 (dbg)": {},
   "Linux (more configs)": {
     "isolated_scripts": [
@@ -2870,28 +2870,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -3279,28 +3257,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -3688,28 +3644,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -4097,28 +4031,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -4506,28 +4418,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -4915,28 +4805,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -5325,28 +5193,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -5774,28 +5620,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -6610,29 +6434,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -7089,29 +6890,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -7926,28 +7704,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -8813,28 +8569,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json
index b6836d0fed..194ab92dc7 100644
--- a/infra/specs/tryserver.webrtc.json
+++ b/infra/specs/tryserver.webrtc.json
@@ -5463,28 +5463,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -5878,28 +5856,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -6288,28 +6244,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -6723,28 +6657,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -7569,28 +7481,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -7978,28 +7868,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -8387,28 +8255,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -8796,28 +8642,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -9205,28 +9029,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Ubuntu",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -9629,29 +9431,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -10059,29 +9838,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cores": "12",
-              "cpu": "x86-64",
-              "os": "Mac",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -10487,28 +10243,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -11351,28 +11085,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "arm64-64-Apple_M1",
-              "os": "Mac",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -11763,28 +11475,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -12176,28 +11866,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -12585,28 +12253,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -12994,28 +12640,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
@@ -13403,28 +13027,6 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
-      {
-        "isolate_name": "video_capture_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "video_capture_tests",
-        "resultdb": {
-          "result_format": "json"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "cpu": "x86-64",
-              "os": "Windows",
-              "pool": "WebRTC-baremetal"
-            }
-          ]
-        },
-        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
-      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index 2af22090a3..36fb01b90d 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -45,11 +45,6 @@
           'gtest_tests': 'android_perf_tests',
         },
       },
-      'Android32 Builder arm64': {
-        'test_suites': {
-          'gtest_tests': 'android_perf_tests',
-        },
-      },
       'Android32 Builder x86': {},
       'Android32 Builder x86 (dbg)': {},
       'Android64 (M Nexus5X)': {
@@ -72,6 +67,11 @@
           'junit_tests': 'android_junit_tests',
         },
       },
+      'Android64 Builder arm64': {
+        'test_suites': {
+          'gtest_tests': 'android_perf_tests',
+        },
+      },
       'Android64 Builder x64 (dbg)': {},
       'Linux (more configs)': {
         'os_type': 'linux',
@@ -84,42 +84,42 @@
         'os_type': 'linux',
         'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'linux_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'Linux MSan': {
         'os_type': 'linux',
         'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'linux_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'Linux Tsan v2': {
         'os_type': 'linux',
         'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'linux_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'Linux UBSan': {
         'os_type': 'linux',
         'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'linux_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'Linux UBSan vptr': {
         'os_type': 'linux',
         'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'linux_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'Linux32 Debug': {
         'os_type': 'linux',
         'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'linux_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'Linux32 Debug (ARM)': {},
@@ -127,7 +127,7 @@
         'os_type': 'linux',
         'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'linux_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'Linux32 Release (ARM)': {},
@@ -141,7 +141,7 @@
         'os_type': 'linux',
         'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'linux_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'Linux64 Debug (ARM)': {},
@@ -158,7 +158,7 @@
         'os_type': 'mac',
         'mixins': ['mac11', 'x86-64', 'cores-12', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'mac_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'Mac64 Builder': {
@@ -172,7 +172,7 @@
         'os_type': 'mac',
         'mixins': ['mac11', 'x86-64', 'cores-12', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'mac_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'Mac64 Release': {
@@ -186,7 +186,7 @@
         'os_type': 'mac',
         'mixins': ['mac-m1', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'mac_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'Win (more configs)': {
@@ -214,7 +214,7 @@
         'os_type': 'win',
         'mixins': ['win10-1703', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'win_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'Win64 Debug (Clang)': {},
@@ -510,7 +510,7 @@
         'os_type': 'linux',
         'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'linux_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'linux_compile_arm64_dbg': {},
@@ -523,7 +523,7 @@
         'os_type': 'linux',
         'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'linux_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'linux_libfuzzer_rel': {},
@@ -531,7 +531,7 @@
         'os_type': 'linux',
         'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'linux_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'linux_more_configs': {
@@ -545,7 +545,7 @@
         'os_type': 'linux',
         'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'linux_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'linux_rel': {
@@ -559,42 +559,42 @@
         'os_type': 'linux',
         'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'linux_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'linux_ubsan': {
         'os_type': 'linux',
         'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'linux_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'linux_ubsan_vptr': {
         'os_type': 'linux',
         'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'linux_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'linux_x86_dbg': {
         'os_type': 'linux',
         'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'linux_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'linux_x86_rel': {
         'os_type': 'linux',
         'mixins': ['linux-bionic', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'linux_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'mac_asan': {
         'os_type': 'mac',
         'mixins': ['mac11', 'x86-64', 'resultdb-json-format', 'cores-12'],
         'test_suites': {
-          'isolated_scripts': 'mac_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'mac_compile_dbg': {},
@@ -603,14 +603,14 @@
         'os_type': 'mac',
         'mixins': ['mac11', 'x86-64', 'resultdb-json-format', 'cores-12'],
         'test_suites': {
-          'isolated_scripts': 'mac_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'mac_dbg_m1': {
         'os_type': 'mac',
         'mixins': ['mac-m1', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'mac_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'mac_rel': {
@@ -624,14 +624,14 @@
         'os_type': 'mac',
         'mixins': ['mac-m1', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'mac_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'win_asan': {
         'os_type': 'win',
         'mixins': ['win10-1703', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'win_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'win_compile_x64_clang_dbg': {},
@@ -642,28 +642,28 @@
         'os_type': 'win',
         'mixins': ['win7', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'win_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'win_x64_clang_dbg_win10': {
         'os_type': 'win',
         'mixins': ['win10-1703', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'win_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'win_x64_clang_rel': {
         'os_type': 'win',
         'mixins': ['win7', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'win_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'win_x86_clang_dbg': {
         'os_type': 'win',
         'mixins': ['win7', 'x86-64', 'resultdb-json-format'],
         'test_suites': {
-          'isolated_scripts': 'win_tests',
+          'isolated_scripts': 'desktop_tests',
         },
       },
       'win_x86_clang_rel': {