Revert "build: roll infra_paths changes"

scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/windows_sdk_multirel.json

Index: scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/windows_sdk_multirel.json
diff --git a/scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/windows_sdk_multirel.json b/scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/windows_sdk_multirel.json
index c40276c0fcf154363d7b90dfcb2eaa2e9d42e0ad..622fba2f51811e42083548598c39287004b7abf5 100644
--- a/scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/windows_sdk_multirel.json
+++ b/scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/windows_sdk_multirel.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-pdf': None, 'src/pdf': None}, 'custom_vars': {'googlecode_url': 'svn://svn.chromium.org/%s', 'sourceforge_url': 'svn://svn.chromium.org/%(repo)s', 'svn_url': 'svn://svn.chromium.org', 'webkit_trunk': 'svn://svn.chromium.org/blink/trunk'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'chrome-official', 'url': 'svn://svn.chromium.org/chrome-internal/trunk/tools/buildspec/build/chrome-official'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_deps': {'src-pdf': None, 'src/pdf': None}, 'custom_vars': {'googlecode_url': 'svn://svn.chromium.org/%s', 'sourceforge_url': 'svn://svn.chromium.org/%(repo)s', 'svn_url': 'svn://svn.chromium.org', 'webkit_trunk': 'svn://svn.chromium.org/blink/trunk'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'chrome-official', 'url': 'svn://svn.chromium.org/chrome-internal/trunk/tools/buildspec/build/chrome-official'}]",
       "--root",
       "chrome-official",
       "--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,13 +114,14 @@
       "python",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "cleanup_temp"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[ROOT]/b/build/scripts/slave/compile.py",
+      "[BUILD]/scripts/slave/compile.py",
       "--solution",
       "all.sln",
       "--project",
@@ -127,6 +131,7 @@
       "--clobber",
       "--compiler=goma"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "compile"
   },
   {
@@ -134,10 +139,11 @@
     "cmd": [
       "python",
       "-u",
-      "[ROOT]/b/build/scripts/slave/chromium/nacl_sdk_buildbot_run.py",
+      "[BUILD]/scripts/slave/chromium/nacl_sdk_buildbot_run.py",
       "--build-properties={\"buildername\":\"windows-sdk-multirel\",\"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\":\"client.nacl.sdk\",\"recipe\":\"client.nacl.sdk.recipe_autogen\",\"revision\":\"123456789abcdef\",\"slavename\":\"TestSlave\"}",
       "--factory-properties={\"annotated_script\":\"nacl_sdk_buildbot_run.py\",\"blink_config\":\"chromium\",\"gclient_env\":{\"CHROMIUM_GYP_SYNTAX_CHECK\":\"1\",\"DEPOT_TOOLS_UPDATE\":\"0\",\"GYP_DEFINES\":\"fastbuild=1 component=static_library\",\"LANDMINES_VERBOSE\":\"1\"},\"no_gclient_branch\":true,\"nuke_and_pave\":true}"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "annotated_steps"
   },
   {