Revert "build: roll infra_paths changes"

scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win_vista_x64_drm.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--master",
       "client.drmemory",
       "--builder",
       "win-vista_x64-drm",
       "--slave",
       "TestSlave",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_deps': {'drmemory/dynamorio': 'https://github.com/DynamoRIO/dynamorio.git', 'tools/buildbot': 'https://github.com/DynamoRIO/buildbot.git'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'drmemory', 'url': 'https://github.com/DynamoRIO/drmemory.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_deps': {'drmemory/dynamorio': 'https://github.com/DynamoRIO/dynamorio.git', 'tools/buildbot': 'https://github.com/DynamoRIO/buildbot.git'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'drmemory', 'url': 'https://github.com/DynamoRIO/drmemory.git'}]",
       "--root",
       "drmemory",
       "--revision_mapping_file",
       "{}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
       "drmemory@123456789abcdef",
       "--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@    \"drmemory\": \"123456789abcdef\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"manifest\": {}, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"drmemory\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"properties\": {}, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"root\": \"drmemory\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"step_text\": \"Some step text\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
-      "[CWD]/tools/buildbot/bot_tools/unpack.bat"
+      "[SLAVE_BUILD]/tools/buildbot/bot_tools/unpack.bat"
     ],
-    "cwd": "[CWD]/tools/buildbot/bot_tools",
+    "cwd": "[SLAVE_BUILD]/tools/buildbot/bot_tools",
     "name": "unpack tools"
   },
   {
     "cmd": [
-      "[ROOT]/b/build/scripts/slave/drmemory/build_env.bat",
+      "[BUILD]/scripts/slave/drmemory/build_env.bat",
       "ctest",
       "--timeout",
       "60",
       "-VV",
       "-S",
-      "[CWD]/drmemory/tests/runsuite.cmake,drmemory_only;long;build=42"
+      "[SLAVE_BUILD]/drmemory/tests/runsuite.cmake,drmemory_only;long;build=42"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Dr. Memory ctest"
   },
   {
     "cmd": [
       "svn",
       "checkout",
       "--force",
       "http://data-race-test.googlecode.com/svn/trunk/",
-      "[CWD]/tsan"
+      "[SLAVE_BUILD]/tsan"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Checkout TSan tests"
   },
   {
     "cmd": [
       "E:\\b\\build\\scripts\\slave\\drmemory\\build_env.bat",
       "make",
       "-C",
-      "[CWD]/tsan/unittest"
+      "[SLAVE_BUILD]/tsan/unittest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
-      "BOTTOOLS": "[CWD]/tools/buildbot/bot_tools",
+      "BOTTOOLS": "[SLAVE_BUILD]/tools/buildbot/bot_tools",
       "CYGWIN": "nodosfilewarning"
     },
     "name": "Build TSan Tests"
   },
   {
     "cmd": [
-      "[ROOT]/b/build/scripts/slave/drmemory/build_env.bat",
+      "[BUILD]/scripts/slave/drmemory/build_env.bat",
       "build_drmemory-dbg-32\\bin\\drmemory",
       "-dr_ops",
       "-msgbox_mask 0 -stderr_mask 15",
       "-results_to_stderr",
       "-batch",
       "-suppress",
-      "[CWD]/drmemory/tests/app_suite/default-suppressions.txt",
+      "[SLAVE_BUILD]/drmemory/tests/app_suite/default-suppressions.txt",
       "--",
-      "[CWD]/tsan/unittest/bin/racecheck_unittest-windows-x86-O0.exe",
+      "[SLAVE_BUILD]/tsan/unittest/bin/racecheck_unittest-windows-x86-O0.exe",
       "--gtest_filter=-PositiveTests.FreeVsRead:NegativeTests.WaitForMultiple*",
       "-147"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
-      "BOTTOOLS": "[CWD]/tools/buildbot/bot_tools"
+      "BOTTOOLS": "[SLAVE_BUILD]/tools/buildbot/bot_tools"
     },
     "name": "dbg full TSan tests"
   },
   {
     "cmd": [
-      "[ROOT]/b/build/scripts/slave/drmemory/build_env.bat",
+      "[BUILD]/scripts/slave/drmemory/build_env.bat",
       "build_drmemory-dbg-32\\bin\\drmemory",
       "-dr_ops",
       "-msgbox_mask 0 -stderr_mask 15",
       "-results_to_stderr",
       "-batch",
       "-suppress",
-      "[CWD]/drmemory/tests/app_suite/default-suppressions.txt",
+      "[SLAVE_BUILD]/drmemory/tests/app_suite/default-suppressions.txt",
       "-light",
       "--",
-      "[CWD]/tsan/unittest/bin/racecheck_unittest-windows-x86-O0.exe",
+      "[SLAVE_BUILD]/tsan/unittest/bin/racecheck_unittest-windows-x86-O0.exe",
       "--gtest_filter=-PositiveTests.FreeVsRead:NegativeTests.WaitForMultiple*",
       "-147"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
-      "BOTTOOLS": "[CWD]/tools/buildbot/bot_tools"
+      "BOTTOOLS": "[SLAVE_BUILD]/tools/buildbot/bot_tools"
     },
     "name": "dbg light TSan tests"
   },
   {
     "cmd": [
-      "[ROOT]/b/build/scripts/slave/drmemory/build_env.bat",
+      "[BUILD]/scripts/slave/drmemory/build_env.bat",
       "build_drmemory-rel-32\\bin\\drmemory",
       "-dr_ops",
       "-msgbox_mask 0 -stderr_mask 15",
       "-results_to_stderr",
       "-batch",
       "-suppress",
-      "[CWD]/drmemory/tests/app_suite/default-suppressions.txt",
+      "[SLAVE_BUILD]/drmemory/tests/app_suite/default-suppressions.txt",
       "--",
-      "[CWD]/tsan/unittest/bin/racecheck_unittest-windows-x86-O0.exe",
+      "[SLAVE_BUILD]/tsan/unittest/bin/racecheck_unittest-windows-x86-O0.exe",
       "--gtest_filter=-PositiveTests.FreeVsRead:NegativeTests.WaitForMultiple*",
       "-147"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
-      "BOTTOOLS": "[CWD]/tools/buildbot/bot_tools"
+      "BOTTOOLS": "[SLAVE_BUILD]/tools/buildbot/bot_tools"
     },
     "name": "rel full TSan tests"
   },
   {
     "cmd": [
-      "[ROOT]/b/build/scripts/slave/drmemory/build_env.bat",
+      "[BUILD]/scripts/slave/drmemory/build_env.bat",
       "build_drmemory-rel-32\\bin\\drmemory",
       "-dr_ops",
       "-msgbox_mask 0 -stderr_mask 15",
       "-results_to_stderr",
       "-batch",
       "-suppress",
-      "[CWD]/drmemory/tests/app_suite/default-suppressions.txt",
+      "[SLAVE_BUILD]/drmemory/tests/app_suite/default-suppressions.txt",
       "-light",
       "--",
-      "[CWD]/tsan/unittest/bin/racecheck_unittest-windows-x86-O0.exe",
+      "[SLAVE_BUILD]/tsan/unittest/bin/racecheck_unittest-windows-x86-O0.exe",
       "--gtest_filter=-PositiveTests.FreeVsRead:NegativeTests.WaitForMultiple*",
       "-147"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
-      "BOTTOOLS": "[CWD]/tools/buildbot/bot_tools"
+      "BOTTOOLS": "[SLAVE_BUILD]/tools/buildbot/bot_tools"
     },
     "name": "rel light TSan tests"
   },
   {
     "cmd": [
-      "[ROOT]/b/build/scripts/slave/drmemory/build_env.bat",
+      "[BUILD]/scripts/slave/drmemory/build_env.bat",
       "build_drmemory-dbg-32\\bin\\drmemory",
       "-dr_ops",
       "-msgbox_mask 0 -stderr_mask 15",
       "-results_to_stderr",
       "-batch",
       "-suppress",
-      "[CWD]/drmemory/tests/app_suite/default-suppressions.txt",
+      "[SLAVE_BUILD]/drmemory/tests/app_suite/default-suppressions.txt",
       "--",
-      "[CWD]/tsan/unittest/bin/racecheck_unittest-windows-x86-O0.exe",
+      "[SLAVE_BUILD]/tsan/unittest/bin/racecheck_unittest-windows-x86-O0.exe",
       "--gtest_filter=-PositiveTests.FreeVsRead:NegativeTests.WaitForMultiple*",
       "-147"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
-      "BOTTOOLS": "[CWD]/tools/buildbot/bot_tools"
+      "BOTTOOLS": "[SLAVE_BUILD]/tools/buildbot/bot_tools"
     },
     "name": "dbg full nosyms TSan tests"
   },
   {
     "cmd": [
-      "[ROOT]/b/build/scripts/slave/drmemory/build_env.bat",
+      "[BUILD]/scripts/slave/drmemory/build_env.bat",
       "7z",
       "a",
       "-xr!*.pdb",
       "testlogs_r123456789abcdef_b42.7z",
       "build_drmemory-dbg-32/logs",
       "build_drmemory-dbg-32/Testing/Temporary",
       "build_drmemory-rel-32/logs",
       "build_drmemory-rel-32/Testing/Temporary",
       "build_drmemory-dbg-64/logs",
       "build_drmemory-dbg-64/Testing/Temporary",
       "build_drmemory-rel-64/logs",
       "build_drmemory-rel-64/Testing/Temporary",
       "xmlresults"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
-      "BOTTOOLS": "[CWD]/tools/buildbot/bot_tools"
+      "BOTTOOLS": "[SLAVE_BUILD]/tools/buildbot/bot_tools"
     },
     "name": "Pack test results"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
-      "[ROOT]/b/depot_tools/gsutil.py",
+      "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "cp",
       "testlogs_r123456789abcdef_b42.7z",
       "gs://chromium-drmemory-builds/testlogs/from_win-vista_x64-drm"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "gsutil upload",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-drmemory-builds/testlogs/from_win-vista_x64-drm@@@"
     ]
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]