Revert "build: roll infra_paths changes"

scripts/slave/recipes/infra/luci_gae.expected/luci_gae.json

Index: scripts/slave/recipes/infra/luci_gae.expected/luci_gae.json
diff --git a/scripts/slave/recipes/infra/luci_gae.expected/luci_gae.json b/scripts/slave/recipes/infra/luci_gae.expected/luci_gae.json
index 4bf8c18eba565986680e5a69b9609e5c3ee3d0ca..92d39da0e386e6a5578547b05cc103dd65ad30a0 100644
--- a/scripts/slave/recipes/infra/luci_gae.expected/luci_gae.json
+++ b/scripts/slave/recipes/infra/luci_gae.expected/luci_gae.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/go/src/github.com/luci/gae",
       "--revision_mapping_file",
       "{\"infra/go/src/github.com/luci/gae\": \"got_revision\"}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -29,6 +29,7 @@
       "--force",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -69,6 +70,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -78,32 +80,35 @@
     "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",
       "go",
       "build",
       "github.com/luci/gae/..."
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "go build"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/infra/go/env.py",
+      "[SLAVE_BUILD]/infra/go/env.py",
       "go",
       "test",
       "github.com/luci/gae/..."
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "go test"
   },
   {