Revert of tryserver.chromium.win: convert chromium_trybot builders to remote_run

scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_clang_x64_rel.json

Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_clang_x64_rel.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_clang_x64_rel.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_clang_x64_rel.json
index babbc32b52915c1578b184155ae21add9c80c7c5..63fa95f209eb1c386899711d2174ef54eb5ebac6 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_clang_x64_rel.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win_clang_x64_rel.json
@@ -12,7 +12,7 @@
       "python",
       "-u",
       "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n  if os.path.exists(path):\n    print \"%s exists but is not a dir\" % path\n    sys.exit(1)\n  os.makedirs(path, mode)\n",
-      "[BUILDER_CACHE]\\win_clang",
+      "[BUILDER_CACHE]\\win_clang_x64_rel",
       "511"
     ],
     "name": "makedirs checkout path",
@@ -60,7 +60,7 @@
       "src@HEAD",
       "--output_manifest"
     ],
-    "cwd": "[BUILDER_CACHE]\\win_clang",
+    "cwd": "[BUILDER_CACHE]\\win_clang_x64_rel",
     "env": {
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -198,7 +198,7 @@
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]\\win_clang\\src\\tools\\swarming_client\\swarming.py",
+      "[BUILDER_CACHE]\\win_clang_x64_rel\\src\\tools\\swarming_client\\swarming.py",
       "--version"
     ],
     "name": "swarming.py --version",
@@ -212,7 +212,7 @@
       "python",
       "-u",
       "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n",
-      "[BUILDER_CACHE]\\win_clang\\src\\out\\Release_x64"
+      "[BUILDER_CACHE]\\win_clang_x64_rel\\src\\out\\Release_x64"
     ],
     "name": "rmtree clobber",
     "~followup_annotations": [
@@ -233,7 +233,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
       "runhooks"
     ],
-    "cwd": "[BUILDER_CACHE]\\win_clang\\src",
+    "cwd": "[BUILDER_CACHE]\\win_clang_x64_rel\\src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
       "GYP_CHROMIUM_NO_ACTION": "1",
@@ -246,14 +246,14 @@
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]\\win_clang\\src\\testing\\scripts\\get_compile_targets.py",
+      "[BUILDER_CACHE]\\win_clang_x64_rel\\src\\testing\\scripts\\get_compile_targets.py",
       "--output",
       "/path/to/tmp/json",
       "--",
       "--build-config-fs",
       "Release_x64",
       "--paths",
-      "{\"checkout\": \"[BUILDER_CACHE]\\\\win_clang\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
+      "{\"checkout\": \"[BUILDER_CACHE]\\\\win_clang_x64_rel\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
       "--properties",
       "{\"buildername\": \"win_clang_x64_rel\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
     ],
@@ -268,12 +268,12 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[BUILDER_CACHE]\\win_clang\\src\\testing\\buildbot\\chromium.fyi.json",
+      "[BUILDER_CACHE]\\win_clang_x64_rel\\src\\testing\\buildbot\\chromium.fyi.json",
       "/path/to/tmp/json"
     ],
     "name": "read test spec (chromium.fyi.json)",
     "~followup_annotations": [
-      "@@@STEP_TEXT@path: [BUILDER_CACHE]\\win_clang\\src\\testing\\buildbot\\chromium.fyi.json@@@",
+      "@@@STEP_TEXT@path: [BUILDER_CACHE]\\win_clang_x64_rel\\src\\testing\\buildbot\\chromium.fyi.json@@@",
       "@@@STEP_LOG_LINE@json.output@{}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
@@ -292,7 +292,7 @@
       "--cached",
       "--name-only"
     ],
-    "cwd": "[BUILDER_CACHE]\\win_clang\\src",
+    "cwd": "[BUILDER_CACHE]\\win_clang_x64_rel\\src",
     "name": "git diff to analyze patch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -306,7 +306,7 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[BUILDER_CACHE]\\win_clang\\src\\testing\\buildbot\\trybot_analyze_config.json",
+      "[BUILDER_CACHE]\\win_clang_x64_rel\\src\\testing\\buildbot\\trybot_analyze_config.json",
       "/path/to/tmp/json"
     ],
     "name": "read filter exclusion spec",
@@ -367,14 +367,14 @@
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]\\win_clang\\src\\tools\\mb\\mb.py",
+      "[BUILDER_CACHE]\\win_clang_x64_rel\\src\\tools\\mb\\mb.py",
       "gen",
       "-m",
       "tryserver.chromium.win",
       "-b",
       "win_clang_x64_rel",
       "--config-file",
-      "[BUILDER_CACHE]\\win_clang\\src\\tools\\mb\\mb_config.pyl",
+      "[BUILDER_CACHE]\\win_clang_x64_rel\\src\\tools\\mb\\mb_config.pyl",
       "--goma-dir",
       "[CACHE]\\cipd\\goma",
       "//out/Release_x64"
@@ -391,7 +391,7 @@
       "-u",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\clang_revision.py",
       "--src-dir",
-      "[BUILDER_CACHE]\\win_clang\\src",
+      "[BUILDER_CACHE]\\win_clang_x64_rel\\src",
       "--output-json",
       "/path/to/tmp/json"
     ],
@@ -421,7 +421,7 @@
       "--target",
       "Release_x64",
       "--src-dir",
-      "[BUILDER_CACHE]\\win_clang\\src",
+      "[BUILDER_CACHE]\\win_clang_x64_rel\\src",
       "--goma-cache-dir",
       "[GOMA_CACHE]",
       "--goma-deps-cache-dir",