Revert "build: roll infra_paths changes"

scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win8_cr_builder_clobber.json

Index: scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win8_cr_builder_clobber.json
diff --git a/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win8_cr_builder_clobber.json b/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win8_cr_builder_clobber.json
index 77207280fb93ac21ec5db376cbfaf48a009450ac..2081ec51a70dc2338914cd7fd5c44dba77e78ecb 100644
--- a/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win8_cr_builder_clobber.json
+++ b/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win8_cr_builder_clobber.json
@@ -3,8 +3,9 @@
     "cmd": [
       "python",
       "-u",
-      "[ROOT]/b/build/scripts/slave/kill_processes.py"
+      "[BUILD]/scripts/slave/kill_processes.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "taskkill"
   },
   {
@@ -19,13 +20,13 @@
       "--slave",
       "TestSlave",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_deps': {'src/third_party/WebKit/LayoutTests': None}, 'custom_vars': {'googlecode_url': 'http://%s.googlecode.com/svn', 'llvm_url': 'http://llvm.org/svn/llvm-project', 'nacl_trunk': 'http://src.chromium.org/native_client/trunk', 'sourceforge_url': 'https://svn.code.sf.net/p/%(repo)s/code', 'webkit_trunk': 'http://src.chromium.org/blink/trunk'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_deps': {'src/third_party/WebKit/LayoutTests': None}, 'custom_vars': {'googlecode_url': 'http://%s.googlecode.com/svn', 'llvm_url': 'http://llvm.org/svn/llvm-project', 'nacl_trunk': 'http://src.chromium.org/native_client/trunk', 'sourceforge_url': 'https://svn.code.sf.net/p/%(repo)s/code', 'webkit_trunk': 'http://src.chromium.org/blink/trunk'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
       "--root",
       "src",
       "--revision_mapping_file",
       "{\"src\": \"got_revision\", \"src/third_party/WebKit\": \"got_webkit_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -33,6 +34,7 @@
       "--force",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -92,8 +94,9 @@
     "cmd": [
       "python",
       "-u",
-      "[ROOT]/b/build/scripts/slave/runhooks_wrapper.py"
+      "[BUILD]/scripts/slave/runhooks_wrapper.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "CHROMIUM_GYP_SYNTAX_CHECK": "1",
       "DEPOT_TOOLS_UPDATE": "0",
@@ -111,12 +114,13 @@
       "python",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "cleanup_temp"
   },
   {
     "cmd": [
       "python_slave",
-      "[ROOT]/b/build/scripts/slave/compile.py",
+      "[BUILD]/scripts/slave/compile.py",
       "--solution",
       "all.sln",
       "--project",
@@ -125,6 +129,7 @@
       "Debug",
       "--clobber"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "compile"
   },
   {