Revert "build: roll infra_paths changes"

scripts/slave/recipes/v8/infra_end_to_end.expected/v8-auto-bisect-end-to-end-pass.json

Index: scripts/slave/recipes/v8/infra_end_to_end.expected/v8-auto-bisect-end-to-end-pass.json
diff --git a/scripts/slave/recipes/v8/infra_end_to_end.expected/v8-auto-bisect-end-to-end-pass.json b/scripts/slave/recipes/v8/infra_end_to_end.expected/v8-auto-bisect-end-to-end-pass.json
index 9b1c9f504b7bb523c0217b1c776f24654cc26366..b492268388f5824fccc2bd7b8f726f773fcb7607 100644
--- a/scripts/slave/recipes/v8/infra_end_to_end.expected/v8-auto-bisect-end-to-end-pass.json
+++ b/scripts/slave/recipes/v8/infra_end_to_end.expected/v8-auto-bisect-end-to-end-pass.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'build', 'url': 'https://chromium.googlesource.com/chromium/tools/build.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'build', 'url': 'https://chromium.googlesource.com/chromium/tools/build.git'}]",
       "--root",
       "build",
       "--revision_mapping_file",
       "{\"build\": \"got_revision\"}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -25,6 +25,7 @@
       "--force",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -60,11 +61,12 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/build/scripts/tools/run_recipe.py",
+      "[SLAVE_BUILD]/build/scripts/tools/run_recipe.py",
       "v8",
       "--properties-file",
       "{\"bisect_duration_factor\": 0.5, \"blamelist\": [\"hax@chromium.org\", \"dude@chromium.org\"], \"branch\": \"master\", \"buildbotURL\": \"http://build.chromium.org/p/client.v8/\", \"buildername\": \"V8 Linux - nosnap\", \"buildnumber\": 5472, \"git_revision\": \"c08e952566c3923f8fcbd693dae05f8eae73938b\", \"mastername\": \"client.v8\", \"override_changes\": [{\"revision\": \"469675ee3f137970158305957a76615d33ff253c\"}, {\"revision\": \"d290f204938295bfecc5c8e645ccfcff6e80ddb8\"}, {\"revision\": \"c08e952566c3923f8fcbd693dae05f8eae73938b\"}], \"parent_buildername\": \"V8 Linux - nosnap builder\", \"parent_buildnumber\": 9423, \"parent_got_revision\": \"c08e952566c3923f8fcbd693dae05f8eae73938b\", \"parent_got_revision_cp\": \"refs/heads/master@{#32376}\", \"parent_got_swarming_client_revision\": \"df99a00d96fae932bae824dccba13156bf7eddd0\", \"project\": \"v8\", \"recipe\": \"v8\", \"repository\": \"https://chromium.googlesource.com/v8/v8\", \"requestedAt\": 1448632553, \"revision\": \"c08e952566c3923f8fcbd693dae05f8eae73938b\", \"slavename\": \"slave4-c3\", \"swarm_hashes\": {\"bot_default\": \"3726ca899b099c077b9551f7163c05ea0f160a7b\", \"mozilla\": \"ba5f8a4aeee89b1fe88c764416ee9875584a10d3\", \"simdjs\": \"55aa4085d018aaf24dc2bc07421515e23cd8a006\"}, \"testfilter\": [\"cctest/test-serialize/ContextDeserialization\"], \"workdir\": \"/b/build/slave/linux\"}"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Test auto-bisect on tester",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [