Revert "build: roll infra_paths changes"

scripts/slave/recipes/infra/infra_continuous.expected/infra_swarming.json

Index: scripts/slave/recipes/infra/infra_continuous.expected/infra_swarming.json
diff --git a/scripts/slave/recipes/infra/infra_continuous.expected/infra_swarming.json b/scripts/slave/recipes/infra/infra_continuous.expected/infra_swarming.json
index 857dfdebaa0ba80c8a469bc85c576e209268970b..3fe0cc825f637d459d859048a3c78e6674c20f45 100644
--- a/scripts/slave/recipes/infra/infra_continuous.expected/infra_swarming.json
+++ b/scripts/slave/recipes/infra/infra_continuous.expected/infra_swarming.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra', 'url': 'https://chromium.googlesource.com/infra/infra.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra', 'url': 'https://chromium.googlesource.com/infra/infra.git'}]",
       "--root",
       "infra",
       "--revision_mapping_file",
       "{\"infra\": \"got_revision\"}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -25,6 +25,7 @@
       "--force",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -63,6 +64,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -75,40 +77,43 @@
       "test.py",
       "test"
     ],
-    "cwd": "[CWD]/infra",
+    "cwd": "[SLAVE_BUILD]/infra",
     "name": "infra python tests"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/infra/glyco/tests/run_all_tests.py"
+      "[SLAVE_BUILD]/infra/glyco/tests/run_all_tests.py"
     ],
-    "cwd": "[CWD]/infra",
+    "cwd": "[SLAVE_BUILD]/infra",
     "name": "Glyco tests"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/infra/go/env.py",
+      "[SLAVE_BUILD]/infra/go/env.py",
       "go",
       "version"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "go third parties"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/infra/go/env.py",
+      "[SLAVE_BUILD]/infra/go/env.py",
       "python",
-      "[CWD]/infra/go/test.py"
+      "[SLAVE_BUILD]/infra/go/test.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "infra go tests"
   },
   {
     "cmd": [],
+    "cwd": "[SLAVE_BUILD]",
     "name": "cipd - not building packages",
     "~followup_annotations": [
       "@@@STEP_WARNINGS@@@"