Revert "build: roll infra_paths changes"

scripts/slave/recipes/ndk/ndk_buildbot.expected/basic.json

Index: scripts/slave/recipes/ndk/ndk_buildbot.expected/basic.json
diff --git a/scripts/slave/recipes/ndk/ndk_buildbot.expected/basic.json b/scripts/slave/recipes/ndk/ndk_buildbot.expected/basic.json
index d03a87ab9a63e0e24aea562dac116edf182415bc..d5797a45420044b99db4fec8614807e2a6f17d67 100644
--- a/scripts/slave/recipes/ndk/ndk_buildbot.expected/basic.json
+++ b/scripts/slave/recipes/ndk/ndk_buildbot.expected/basic.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlavename",
       "--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]"
     },
@@ -49,7 +50,7 @@
   {
     "allow_subannotations": true,
     "cmd": [
-      "[CWD]/chromite/bin/cbuildbot",
+      "[SLAVE_BUILD]/chromite/bin/cbuildbot",
       "--buildroot",
       "[ROOT]/cbuild/android",
       "--buildbot",
@@ -61,7 +62,7 @@
       "https://android.googlesource.com/toolchain/ndk_chromite_config",
       "ndk-linux-arm64-v8a"
     ],
-    "cwd": "[CWD]",
+    "cwd": "[SLAVE_BUILD]",
     "name": "cbuildbot [ndk-linux-arm64-v8a]"
   },
   {