Revert "build: roll infra_paths changes"

scripts/slave/recipes/cros/cbuildbot_tryjob.expected/basic_compressed.json

Index: scripts/slave/recipes/cros/cbuildbot_tryjob.expected/basic_compressed.json
diff --git a/scripts/slave/recipes/cros/cbuildbot_tryjob.expected/basic_compressed.json b/scripts/slave/recipes/cros/cbuildbot_tryjob.expected/basic_compressed.json
index 15f108a19039572717c43fd866d9aa558448704e..389085eb754ea664e5d699236e108cf6df9a8810 100644
--- a/scripts/slave/recipes/cros/cbuildbot_tryjob.expected/basic_compressed.json
+++ b/scripts/slave/recipes/cros/cbuildbot_tryjob.expected/basic_compressed.json
@@ -11,13 +11,13 @@
       "--slave",
       "test",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'chromite', 'url': 'https://chromium.googlesource.com/chromiumos/chromite.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'chromite', 'url': 'https://chromium.googlesource.com/chromiumos/chromite.git'}]",
       "--root",
       "chromite",
       "--revision_mapping_file",
       "{}",
       "--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]"
     },
@@ -52,7 +53,7 @@
       "checkout",
       "master"
     ],
-    "cwd": "[CWD]/chromite",
+    "cwd": "[SLAVE_BUILD]/chromite",
     "name": "checkout chromite branch [master]"
   },
   {
@@ -60,7 +61,7 @@
       "git",
       "pull"
     ],
-    "cwd": "[CWD]/chromite",
+    "cwd": "[SLAVE_BUILD]/chromite",
     "name": "sync chromite branch [master]"
   },
   {
@@ -68,9 +69,10 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[CWD]/chromite/cbuildbot/config_dump.json",
+      "[SLAVE_BUILD]/chromite/cbuildbot/config_dump.json",
       "/path/to/tmp/json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "read chromite config",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@config@{@@@",
@@ -85,7 +87,7 @@
   {
     "allow_subannotations": true,
     "cmd": [
-      "[CWD]/chromite/bin/cbuildbot",
+      "[SLAVE_BUILD]/chromite/bin/cbuildbot",
       "--buildroot",
       "[ROOT]/cbuild/external_master",
       "--timeout",
@@ -94,7 +96,7 @@
       "--remote-version=4",
       "x86-generic-full"
     ],
-    "cwd": "[CWD]",
+    "cwd": "[SLAVE_BUILD]",
     "name": "cbuildbot [x86-generic-full]"
   },
   {