Revert "build: roll infra_paths changes"

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

Index: scripts/slave/recipes/infra/luci_gae.expected/presubmit_try_job.json
diff --git a/scripts/slave/recipes/infra/luci_gae.expected/presubmit_try_job.json b/scripts/slave/recipes/infra/luci_gae.expected/presubmit_try_job.json
index aeb23e8122f91b80482fecb9299732e4393ae615..96e73e54c7d2550d5a0b11aea2d8b5379452737b 100644
--- a/scripts/slave/recipes/infra/luci_gae.expected/presubmit_try_job.json
+++ b/scripts/slave/recipes/infra/luci_gae.expected/presubmit_try_job.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]",
       "--issue",
       "12853011",
       "--patchset",
@@ -35,6 +35,7 @@
       "--force",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -80,7 +81,7 @@
       "-m",
       "Committed patch"
     ],
-    "cwd": "[CWD]/infra/go/src/github.com/luci/gae",
+    "cwd": "[SLAVE_BUILD]/infra/go/src/github.com/luci/gae",
     "name": "commit git patch"
   },
   {
@@ -90,6 +91,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -99,21 +101,22 @@
     "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",
-      "[ROOT]/b/depot_tools/presubmit_support.py",
+      "[DEPOT_TOOLS]/presubmit_support.py",
       "--root",
-      "[CWD]/infra/go/src/github.com/luci/gae",
+      "[SLAVE_BUILD]/infra/go/src/github.com/luci/gae",
       "--commit",
       "--verbose",
       "--verbose",
@@ -135,6 +138,7 @@
       "--rietveld_email",
       ""
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PRESUBMIT_BUILDER": "1"
     },