Revert "sandwich: Fix some trivial failures on SWR benchmark runs"

testing/buildbot/chromium.linux.json

 {
   "Android Arm64 Builder (dbg)": {
     "additional_compile_targets": [
       "all"
     ]
   },
   "Android Builder": {
     "additional_compile_targets": [
       "cronet_test_instrumentation_apk",
       "system_webview_apk"
@@ skipping 636 matching lines @@
     "scripts": [
       {
         "name": "webview_licenses",
         "script": "webview_licenses.py"
       }
     ]
   },
   "Android Tests (dbg)": {
     "gtest_tests": [
       {
-        "test": "android_webview_unittests"
-      },
-      {
-        "test": "base_unittests"
-      },
-      {
-        "test": "blimp_unittests"
-      },
-      {
-        "test": "blink_heap_unittests"
-      },
-      {
-        "override_compile_targets": [
-          "breakpad_unittests"
-        ],
-        "test": "breakpad_unittests"
-      },
-      {
-        "test": "capture_unittests"
-      },
-      {
-        "test": "cc_unittests"
-      },
-      {
-        "test": "components_browsertests"
-      },
-      {
-        "test": "components_unittests"
-      },
-      {
-        "test": "content_browsertests"
-      },
-      {
-        "test": "content_unittests"
-      },
-      {
-        "test": "device_unittests"
-      },
-      {
-        "test": "events_unittests"
-      },
-      {
-        "test": "gl_tests"
-      },
-      {
-        "test": "gl_unittests"
-      },
-      {
-        "test": "gpu_ipc_service_unittests"
-      },
-      {
-        "test": "gpu_unittests"
-      },
-      {
-        "test": "ipc_tests"
-      },
-      {
-        "test": "media_unittests"
-      },
-      {
-        "test": "mojo_common_unittests"
-      },
-      {
-        "test": "mojo_public_application_unittests"
-      },
-      {
-        "test": "mojo_public_bindings_unittests"
-      },
-      {
-        "test": "mojo_public_system_unittests"
-      },
-      {
-        "test": "mojo_runner_host_unittests"
-      },
-      {
-        "test": "mojo_system_unittests"
-      },
-      {
-        "test": "net_unittests"
-      },
-      {
-        "override_compile_targets": [
-          "sandbox_linux_unittests"
-        ],
-        "test": "sandbox_linux_unittests"
-      },
-      {
-        "test": "sql_unittests"
-      },
-      {
-        "test": "sync_unit_tests"
-      },
-      {
-        "test": "ui_android_unittests"
-      },
-      {
-        "test": "ui_base_unittests"
-      },
-      {
-        "test": "ui_touch_selection_unittests"
-      },
-      {
         "test": "unit_tests"
       }
-    ],
-    "instrumentation_tests": [
-      {
-        "test": "android_webview_test_apk"
-      },
-      {
-        "test": "blimp_test_apk"
-      },
-      {
-        "test": "chrome_public_test_apk"
-      },
-      {
-        "test": "chrome_sync_shell_test_apk"
-      },
-      {
-        "test": "content_shell_test_apk"
-      }
-    ],
-    "junit_tests": [
-      {
-        "test": "base_junit_tests"
-      },
-      {
-        "test": "chrome_junit_tests"
-      },
-      {
-        "test": "components_invalidation_impl_junit_tests"
-      },
-      {
-        "test": "components_policy_junit_tests"
-      },
-      {
-        "test": "components_web_restrictions_junit_tests"
-      },
-      {
-        "test": "content_junit_tests"
-      },
-      {
-        "test": "junit_unit_tests"
-      },
-      {
-        "test": "net_junit_tests"
-      },
-      {
-        "test": "ui_junit_tests"
-      },
-      {
-        "test": "webapk_client_junit_tests"
-      }
-    ],
-    "scripts": [
-      {
-        "name": "webview_licenses",
-        "script": "webview_licenses.py"
-      },
-      {
-        "name": "telemetry_perf_unittests",
-        "script": "telemetry_perf_unittests.py"
-      }
     ]
   },
   "Blimp Linux (dbg)": {
     "gtest_tests": [
       {
         "test": "blimp_browsertests"
       }
     ]
   },
   "Cast Linux": {
@@ skipping 1434 matching lines @@
         "override_compile_targets": [
           "telemetry_unittests_run"
         ],
         "swarming": {
           "can_use_on_swarming_builders": true
         }
       }
     ]
   }
 }