Revert "build: roll infra_paths changes"

scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_Syzygy_Official.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "taskkill"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
       "--master",
       "master.client.syzygy",
       "--builder",
       "Syzygy Official",
       "--slave",
       "vm331-m3",
       "--spec",
-      "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/github.com/google/syzygy.git/'}, {'deps_file': 'DEPS', 'managed': False, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/syzygy/internal.DEPS.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/github.com/google/syzygy.git/'}, {'deps_file': 'DEPS', 'managed': False, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/syzygy/internal.DEPS.git'}]",
       "--root",
       "src",
       "--revision_mapping_file",
       "{\"src\": \"got_revision\"}",
       "--git-cache-dir",
-      "[ROOT]\\b\\build\\slave\\cache_dir",
+      "[GIT_CACHE]",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
       "src@0e9f25b1098271be2b096fd1c095d6d907cf86f7",
       "--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\": \"0e9f25b1098271be2b096fd1c095d6d907cf86f7\"@@@",
@@ skipping 19 matching lines @@
       "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
       "GYP_DEFINES": "official_build=1 target_arch=ia32",
       "GYP_GENERATORS": "msvs-ninja,ninja",
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
       "--show-path",
       "python",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\compile.py",
       "--gsutil-py-path",
       "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
       "--ninja-path",
       "RECIPE_PACKAGE_REPO[depot_tools]\\ninja.exe",
       "--target",
       "Release",
       "--src-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--goma-cache-dir",
-      "[ROOT]\\b\\build\\slave\\goma_cache",
+      "[GOMA_CACHE]",
       "--build-tool",
       "ninja",
       "--ninja-ensure-up-to-date",
       "--clobber",
       "--",
       "official_build"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
     },
     "name": "compile"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\nchromium_utils.RemoveFilesWildcards(sys.argv[1], root=sys.argv[2])\n",
       "metrics.csv",
-      "[CWD]\\src\\out\\Release"
+      "[SLAVE_BUILD]\\src\\out\\Release"
     ],
-    "name": "rmwildcard metrics.csv in [CWD]\\src\\out\\Release",
+    "cwd": "[SLAVE_BUILD]",
+    "name": "rmwildcard metrics.csv in [SLAVE_BUILD]\\src\\out\\Release",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import sys@@@",
       "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@chromium_utils.RemoveFilesWildcards(sys.argv[1], root=sys.argv[2])@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[CWD]\\src\\syzygy\\unittests.gypi",
+      "[SLAVE_BUILD]\\src\\syzygy\\unittests.gypi",
       "/path/to/tmp/"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "read_unittests_gypi"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
       "--target",
       "Release",
       "--factory-properties",
       "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Syzygy Official\", \"buildnumber\": 571, \"mastername\": \"master.client.syzygy\", \"recipe\": \"syzygy/continuous\", \"revision\": \"0e9f25b1098271be2b096fd1c095d6d907cf86f7\", \"slavename\": \"vm331-m3\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--build-properties",
       "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Syzygy Official\", \"buildnumber\": 571, \"mastername\": \"master.client.syzygy\", \"recipe\": \"syzygy/continuous\", \"revision\": \"0e9f25b1098271be2b096fd1c095d6d907cf86f7\", \"slavename\": \"vm331-m3\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--test-type=bar_unittests",
       "--step-name=bar_unittests",
       "--builder-name=Syzygy Official",
       "--slave-name=vm331-m3",
       "--build-number=571",
-      "[CWD]\\src\\out\\Release\\bar_unittests.exe",
+      "[SLAVE_BUILD]\\src\\out\\Release\\bar_unittests.exe",
       "--single-process-tests",
       "--test-launcher-timeout=300000",
       "--gtest_print_time"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "bar_unittests"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
       "--target",
       "Release",
       "--factory-properties",
       "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Syzygy Official\", \"buildnumber\": 571, \"mastername\": \"master.client.syzygy\", \"recipe\": \"syzygy/continuous\", \"revision\": \"0e9f25b1098271be2b096fd1c095d6d907cf86f7\", \"slavename\": \"vm331-m3\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--build-properties",
       "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Syzygy Official\", \"buildnumber\": 571, \"mastername\": \"master.client.syzygy\", \"recipe\": \"syzygy/continuous\", \"revision\": \"0e9f25b1098271be2b096fd1c095d6d907cf86f7\", \"slavename\": \"vm331-m3\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--test-type=baz_unittests",
       "--step-name=baz_unittests",
       "--builder-name=Syzygy Official",
       "--slave-name=vm331-m3",
       "--build-number=571",
-      "[CWD]\\src\\out\\Release\\baz_unittests.exe",
+      "[SLAVE_BUILD]\\src\\out\\Release\\baz_unittests.exe",
       "--single-process-tests",
       "--test-launcher-timeout=300000",
       "--gtest_print_time"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "baz_unittests"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
       "--target",
       "Release",
       "--factory-properties",
       "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Syzygy Official\", \"buildnumber\": 571, \"mastername\": \"master.client.syzygy\", \"recipe\": \"syzygy/continuous\", \"revision\": \"0e9f25b1098271be2b096fd1c095d6d907cf86f7\", \"slavename\": \"vm331-m3\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--build-properties",
       "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Syzygy Official\", \"buildnumber\": 571, \"mastername\": \"master.client.syzygy\", \"recipe\": \"syzygy/continuous\", \"revision\": \"0e9f25b1098271be2b096fd1c095d6d907cf86f7\", \"slavename\": \"vm331-m3\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--test-type=foo_unittests",
       "--step-name=foo_unittests",
       "--builder-name=Syzygy Official",
       "--slave-name=vm331-m3",
       "--build-number=571",
-      "[CWD]\\src\\out\\Release\\foo_unittests.exe",
+      "[SLAVE_BUILD]\\src\\out\\Release\\foo_unittests.exe",
       "--single-process-tests",
       "--test-launcher-timeout=300000",
       "--gtest_print_time"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "foo_unittests"
   },
   {
     "cmd": [
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\gsutil.bat",
       "cp",
       "-t",
       "-a",
       "public-read",
-      "[CWD]\\src\\out\\Release\\metrics.csv",
+      "[SLAVE_BUILD]\\src\\out\\Release\\metrics.csv",
       "gs://syzygy-archive/builds/metrics/f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9/official.csv"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "archive_metrics",
     "~followup_annotations": [
       "@@@STEP_LINK@archive@https://syzygy-archive.commondatastorage.googleapis.com/index.html?path=builds/metrics/f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9/official.csv/@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]\\src\\syzygy\\internal\\build\\randomize_chrome.py",
+      "[SLAVE_BUILD]\\src\\syzygy\\internal\\build\\randomize_chrome.py",
       "--build-dir",
-      "[CWD]\\src\\out",
+      "[SLAVE_BUILD]\\src\\out",
       "--target",
       "Release",
       "--verbose"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "randomly_reorder_chrome"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]\\src\\syzygy\\internal\\build\\benchmark_chrome.py",
+      "[SLAVE_BUILD]\\src\\syzygy\\internal\\build\\benchmark_chrome.py",
       "--build-dir",
-      "[CWD]\\src\\out",
+      "[SLAVE_BUILD]\\src\\out",
       "--target",
       "Release",
       "--verbose"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "benchmark_chrome"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[CWD]\\src\\syzygy\\SYZYGY_VERSION",
+      "[SLAVE_BUILD]\\src\\syzygy\\SYZYGY_VERSION",
       "/path/to/tmp/"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "read_version"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\syzygy\\gsutil_cp_dir.py",
       "--public-read",
-      "[CWD]\\src\\out\\Release\\archive",
+      "[SLAVE_BUILD]\\src\\out\\Release\\archive",
       "gs://syzygy-archive/builds/official/f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "archive_binaries",
     "~followup_annotations": [
       "@@@STEP_LINK@0.0.0.1 archive@https://syzygy-archive.commondatastorage.googleapis.com/index.html?path=builds/official/f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9/@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]\\src\\syzygy\\internal\\scripts\\archive_symbols.py",
+      "[SLAVE_BUILD]\\src\\syzygy\\internal\\scripts\\archive_symbols.py",
       "-s",
       "-b",
-      "[CWD]\\src\\out\\Release\\*asan_rtl.dll",
-      "[CWD]\\src\\out\\Release\\*client.dll"
+      "[SLAVE_BUILD]\\src\\out\\Release\\*asan_rtl.dll",
+      "[SLAVE_BUILD]\\src\\out\\Release\\*client.dll"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "upload_symbols"
   },
   {
     "cmd": [],
+    "cwd": "[SLAVE_BUILD]",
     "name": "trigger",
     "trigger_specs": [
       {
         "builder_name": "Syzygy Smoke Test",
         "properties": {
           "blamelist": [
             "cool_dev1337@chromium.org",
             "hax@chromium.org"
           ],
           "revision": "0e9f25b1098271be2b096fd1c095d6d907cf86f7"
         }
       }
     ],
     "~followup_annotations": [
       "@@@STEP_TEXT@Syzygy Smoke Test@@@"
     ]
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]