Revert "build: roll infra_paths changes"

scripts/slave/recipes/chromium.fyi.drmemory_win_block.recipe_autogen.expected/Windows_Browser__DrMemory_light___1_.json

Index: scripts/slave/recipes/chromium.fyi.drmemory_win_block.recipe_autogen.expected/Windows_Browser__DrMemory_light___1_.json
diff --git a/scripts/slave/recipes/chromium.fyi.drmemory_win_block.recipe_autogen.expected/Windows_Browser__DrMemory_light___1_.json b/scripts/slave/recipes/chromium.fyi.drmemory_win_block.recipe_autogen.expected/Windows_Browser__DrMemory_light___1_.json
index 5b01892cd229b0ec5f7c2e0ae9b2a94227abaf4c..7b227ce6a186ab7834e54083702f17924beffc28 100644
--- a/scripts/slave/recipes/chromium.fyi.drmemory_win_block.recipe_autogen.expected/Windows_Browser__DrMemory_light___1_.json
+++ b/scripts/slave/recipes/chromium.fyi.drmemory_win_block.recipe_autogen.expected/Windows_Browser__DrMemory_light___1_.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",
@@ -112,26 +115,28 @@
       "python",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "cleanup_temp"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[ROOT]/b/build/scripts/slave/extract_build.py",
+      "[BUILD]/scripts/slave/extract_build.py",
       "--target",
       "Release",
       "--build-archive-url",
       "abc",
       "--build-properties={\"buildername\":\"Windows Browser (DrMemory light) (1)\",\"buildnumber\":\"42\",\"got_revision\":\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\",\"got_revision_cp\":\"refs/heads/master@{#170242}\",\"got_swarming_client_revision\":\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\",\"got_swarming_client_revision_cp\":\"refs/heads/master@{#276089}\",\"got_v8_revision\":\"801ada225ddc271c132c3a35f03975671d43e399\",\"got_v8_revision_cp\":\"refs/heads/master@{#43426}\",\"got_webkit_revision\":\"5e2293dffc3cd07d37fbedea3b500f0eb650614d\",\"got_webkit_revision_cp\":\"refs/heads/master@{#124383}\",\"mastername\":\"chromium.fyi\",\"parent_build_archive_url\":\"abc\",\"recipe\":\"chromium.fyi.drmemory_win_block.recipe_autogen\",\"revision\":\"123456789abcdef\",\"slavename\":\"TestSlave\"}"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "extract build"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[ROOT]/b/build/scripts/slave/runtest.py",
+      "[BUILD]/scripts/slave/runtest.py",
       "--run-shell-script",
       "--target",
       "Release",
@@ -152,6 +157,7 @@
       "--tool",
       "drmemory_light"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "memory test: browser_tests"
   },
   {