Revert "build: roll infra_paths changes"

scripts/slave/recipes/infra/infra_repo_trybot.expected/basic_gerrit.json

Index: scripts/slave/recipes/infra/infra_repo_trybot.expected/basic_gerrit.json
diff --git a/scripts/slave/recipes/infra/infra_repo_trybot.expected/basic_gerrit.json b/scripts/slave/recipes/infra/infra_repo_trybot.expected/basic_gerrit.json
index 1f6a0a4dd845e3e084784ed7a075c71b7ffaa604..5e4a0af5459115612bccd322584579121078a348 100644
--- a/scripts/slave/recipes/infra/infra_repo_trybot.expected/basic_gerrit.json
+++ b/scripts/slave/recipes/infra/infra_repo_trybot.expected/basic_gerrit.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]",
       "--gerrit_repo",
       "https://chromium.googlesource.com/infra/infra",
       "--gerrit_ref",
@@ -29,6 +29,7 @@
       "--force",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -72,7 +73,7 @@
       "-m",
       "Committed patch"
     ],
-    "cwd": "[CWD]/infra",
+    "cwd": "[SLAVE_BUILD]/infra",
     "name": "commit git patch"
   },
   {
@@ -82,6 +83,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -95,7 +97,7 @@
       "HEAD",
       "HEAD~"
     ],
-    "cwd": "[CWD]/infra",
+    "cwd": "[SLAVE_BUILD]/infra",
     "name": "get change list",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -111,25 +113,27 @@
       "test.py",
       "test"
     ],
-    "cwd": "[CWD]/infra",
+    "cwd": "[SLAVE_BUILD]/infra",
     "name": "python tests"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/infra/go/env.py"
+      "[SLAVE_BUILD]/infra/go/env.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "go bootstrap"
   },
   {
     "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": "go tests"
   },
   {