Revert "build: roll infra_paths changes"

scripts/slave/recipes/legion/legion.expected/basic.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--master",
       "chromium.testing.master",
       "--builder",
       "TestBuilder",
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src",
       "--revision_mapping_file",
       "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_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",
       "src@HEAD",
       "--force",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
@@ skipping 55 matching lines @@
       "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
       "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
       "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
       "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/tools/swarming_client/isolate.py",
+      "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py",
       "archive",
       "--isolate",
-      "[CWD]/src/testing/legion/examples/hello_world/controller_test.isolate",
+      "[SLAVE_BUILD]/src/testing/legion/examples/hello_world/controller_test.isolate",
       "--isolated",
-      "[CWD]/src/testing/legion/examples/hello_world/controller_test.isolated",
+      "[SLAVE_BUILD]/src/testing/legion/examples/hello_world/controller_test.isolated",
       "--isolate-server",
       "https://omnibot-legion-isolate-server.appspot.com",
       "--config-variable",
       "multi_machine",
       "1"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "archive for controller_test.isolate"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/tools/swarming_client/isolate.py",
+      "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py",
       "archive",
       "--isolate",
-      "[CWD]/src/testing/legion/examples/hello_world/task_test.isolate",
+      "[SLAVE_BUILD]/src/testing/legion/examples/hello_world/task_test.isolate",
       "--isolated",
-      "[CWD]/src/testing/legion/examples/hello_world/task_test.isolated",
+      "[SLAVE_BUILD]/src/testing/legion/examples/hello_world/task_test.isolated",
       "--isolate-server",
       "https://omnibot-legion-isolate-server.appspot.com",
       "--config-variable",
       "multi_machine",
       "1"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "archive for task_test.isolate"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/testing/legion/tools/legion.py",
+      "[SLAVE_BUILD]/src/testing/legion/tools/legion.py",
       "run",
       "--controller-isolated",
-      "[CWD]/src/testing/legion/examples/hello_world/controller_test.isolated",
+      "[SLAVE_BUILD]/src/testing/legion/examples/hello_world/controller_test.isolated",
       "--task-name",
       "hello_world_test",
       "--isolate-server",
       "https://omnibot-legion-isolate-server.appspot.com",
       "--swarming-server",
       "https://omnibot-legion-swarming-server.appspot.com",
       "--dimension",
       "os",
       "Linux",
       "--controller-var",
       "verbosity",
       "INFO",
       "--task",
       "task-hash",
-      "[CWD]/src/testing/legion/examples/hello_world/task_test.isolated"
+      "[SLAVE_BUILD]/src/testing/legion/examples/hello_world/task_test.isolated"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Running test for hello_world_test",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/tools/swarming_client/isolate.py",
+      "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py",
       "archive",
       "--isolate",
-      "[CWD]/src/testing/legion/examples/subprocess/subprocess_test.isolate",
+      "[SLAVE_BUILD]/src/testing/legion/examples/subprocess/subprocess_test.isolate",
       "--isolated",
-      "[CWD]/src/testing/legion/examples/subprocess/subprocess_test.isolated",
+      "[SLAVE_BUILD]/src/testing/legion/examples/subprocess/subprocess_test.isolated",
       "--isolate-server",
       "https://omnibot-legion-isolate-server.appspot.com",
       "--config-variable",
       "multi_machine",
       "1"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "archive for subprocess_test.isolate"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/tools/swarming_client/isolate.py",
+      "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py",
       "archive",
       "--isolate",
-      "[CWD]/src/testing/legion/examples/subprocess/task.isolate",
+      "[SLAVE_BUILD]/src/testing/legion/examples/subprocess/task.isolate",
       "--isolated",
-      "[CWD]/src/testing/legion/examples/subprocess/task.isolated",
+      "[SLAVE_BUILD]/src/testing/legion/examples/subprocess/task.isolated",
       "--isolate-server",
       "https://omnibot-legion-isolate-server.appspot.com",
       "--config-variable",
       "multi_machine",
       "1"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "archive for task.isolate"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/testing/legion/tools/legion.py",
+      "[SLAVE_BUILD]/src/testing/legion/tools/legion.py",
       "run",
       "--controller-isolated",
-      "[CWD]/src/testing/legion/examples/subprocess/subprocess_test.isolated",
+      "[SLAVE_BUILD]/src/testing/legion/examples/subprocess/subprocess_test.isolated",
       "--task-name",
       "subprocess_test",
       "--isolate-server",
       "https://omnibot-legion-isolate-server.appspot.com",
       "--swarming-server",
       "https://omnibot-legion-swarming-server.appspot.com",
       "--dimension",
       "os",
       "Linux",
       "--controller-var",
       "verbosity",
       "INFO",
       "--task",
       "task-hash",
-      "[CWD]/src/testing/legion/examples/subprocess/task.isolated"
+      "[SLAVE_BUILD]/src/testing/legion/examples/subprocess/task.isolated"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Running test for subprocess_test",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/tools/swarming_client/isolate.py",
+      "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py",
       "archive",
       "--isolate",
-      "[CWD]/src/testing/legion/examples/http_example/http_test.isolate",
+      "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_test.isolate",
       "--isolated",
-      "[CWD]/src/testing/legion/examples/http_example/http_test.isolated",
+      "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_test.isolated",
       "--isolate-server",
       "https://omnibot-legion-isolate-server.appspot.com",
       "--config-variable",
       "multi_machine",
       "1"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "archive for http_test.isolate"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/tools/swarming_client/isolate.py",
+      "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py",
       "archive",
       "--isolate",
-      "[CWD]/src/testing/legion/examples/http_example/http_client.isolate",
+      "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_client.isolate",
       "--isolated",
-      "[CWD]/src/testing/legion/examples/http_example/http_client.isolated",
+      "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_client.isolated",
       "--isolate-server",
       "https://omnibot-legion-isolate-server.appspot.com",
       "--config-variable",
       "multi_machine",
       "1"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "archive for http_client.isolate"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/tools/swarming_client/isolate.py",
+      "[SLAVE_BUILD]/src/tools/swarming_client/isolate.py",
       "archive",
       "--isolate",
-      "[CWD]/src/testing/legion/examples/http_example/http_server.isolate",
+      "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_server.isolate",
       "--isolated",
-      "[CWD]/src/testing/legion/examples/http_example/http_server.isolated",
+      "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_server.isolated",
       "--isolate-server",
       "https://omnibot-legion-isolate-server.appspot.com",
       "--config-variable",
       "multi_machine",
       "1"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "archive for http_server.isolate"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/testing/legion/tools/legion.py",
+      "[SLAVE_BUILD]/src/testing/legion/tools/legion.py",
       "run",
       "--controller-isolated",
-      "[CWD]/src/testing/legion/examples/http_example/http_test.isolated",
+      "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_test.isolated",
       "--task-name",
       "http_test",
       "--isolate-server",
       "https://omnibot-legion-isolate-server.appspot.com",
       "--swarming-server",
       "https://omnibot-legion-swarming-server.appspot.com",
       "--dimension",
       "os",
       "Linux",
       "--controller-var",
       "verbosity",
       "INFO",
       "--task",
       "http-client",
-      "[CWD]/src/testing/legion/examples/http_example/http_client.isolated",
+      "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_client.isolated",
       "--task",
       "http-server",
-      "[CWD]/src/testing/legion/examples/http_example/http_server.isolated"
+      "[SLAVE_BUILD]/src/testing/legion/examples/http_example/http_server.isolated"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Running test for http_test",
     "stdout": "/path/to/tmp/"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]