Revert "build: roll infra_paths changes"

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

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--master",
       "client.drmemory",
       "--builder",
       "linux-cr",
       "--slave",
       "TestSlave",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'dynamorio', 'url': 'https://github.com/DynamoRIO/dynamorio.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'dynamorio', 'url': 'https://github.com/DynamoRIO/dynamorio.git'}]",
       "--root",
       "dynamorio",
       "--revision_mapping_file",
       "{}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
       "dynamorio@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@    \"dynamorio\": \"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\": \"dynamorio\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"properties\": {}, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"root\": \"dynamorio\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"step_text\": \"Some step text\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n  if os.path.exists(path):\n    print \"%s exists but is not a dir\" % path\n    sys.exit(1)\n  os.makedirs(path, mode)\n",
-      "[CWD]/dynamorio",
+      "[SLAVE_BUILD]/dynamorio",
       "511"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "makedirs makedirs",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
       "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
       "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
       "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
       "@@@STEP_LOG_LINE@python.inline@  if os.path.exists(path):@@@",
       "@@@STEP_LOG_LINE@python.inline@    print \"%s exists but is not a dir\" % path@@@",
       "@@@STEP_LOG_LINE@python.inline@    sys.exit(1)@@@",
       "@@@STEP_LOG_LINE@python.inline@  os.makedirs(path, mode)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n  if os.path.exists(path):\n    print \"%s exists but is not a dir\" % path\n    sys.exit(1)\n  os.makedirs(path, mode)\n",
-      "[CWD]/dynamorio/build",
+      "[SLAVE_BUILD]/dynamorio/build",
       "511"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "makedirs makedirs (2)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
       "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
       "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
       "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
       "@@@STEP_LOG_LINE@python.inline@  if os.path.exists(path):@@@",
       "@@@STEP_LOG_LINE@python.inline@    print \"%s exists but is not a dir\" % path@@@",
       "@@@STEP_LOG_LINE@python.inline@    sys.exit(1)@@@",
       "@@@STEP_LOG_LINE@python.inline@  os.makedirs(path, mode)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "cmd": [
       "cmake",
       "..",
       "-DDEBUG=OFF"
     ],
-    "cwd": "[CWD]/dynamorio/build",
+    "cwd": "[SLAVE_BUILD]/dynamorio/build",
     "name": "Configure release DynamoRIO"
   },
   {
     "cmd": [
       "make",
       "-j5"
     ],
-    "cwd": "[CWD]/dynamorio/build",
+    "cwd": "[SLAVE_BUILD]/dynamorio/build",
     "name": "Compile release DynamoRIO"
   },
   {
     "cmd": [
       "bin64/drconfig",
       "-reg",
       "python",
       "-norun",
       "-v"
     ],
-    "cwd": "[CWD]/dynamorio/build",
+    "cwd": "[SLAVE_BUILD]/dynamorio/build",
     "name": "don't follow python"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
-      "[CWD]/dynamorio/build/bin64/drrun",
+      "[SLAVE_BUILD]/dynamorio/build/bin64/drrun",
       "-stderr_mask",
       "12",
       "--",
       "../../linux-cr-builder/build/src/out/Release/content_shell",
       "--run-layout-test",
       "file:///home/chrome-bot/bb.html"
     ],
-    "cwd": "[CWD]/dynamorio",
+    "cwd": "[SLAVE_BUILD]/dynamorio",
     "env": {
       "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
     },
     "name": "content_shell"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
-      "[CWD]/dynamorio/build/bin64/drrun",
+      "[SLAVE_BUILD]/dynamorio/build/bin64/drrun",
       "-stderr_mask",
       "12",
       "--",
       "../../linux-cr-builder/build/src/out/Release/base_unittests",
       "--gtest_filter=-TraceEventTestFixture.TraceContinuousSampling"
     ],
-    "cwd": "[CWD]/dynamorio",
+    "cwd": "[SLAVE_BUILD]/dynamorio",
     "env": {
       "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
     },
     "name": "base_unittests"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
-      "[CWD]/dynamorio/build/bin64/drrun",
+      "[SLAVE_BUILD]/dynamorio/build/bin64/drrun",
       "-stderr_mask",
       "12",
       "--",
       "../../linux-cr-builder/build/src/out/Release/browser_tests",
       "--gtest_filter=AutofillTest.BasicFormFill"
     ],
-    "cwd": "[CWD]/dynamorio",
+    "cwd": "[SLAVE_BUILD]/dynamorio",
     "env": {
       "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
     },
     "name": "browser_tests"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
-      "[CWD]/dynamorio/build/bin64/drrun",
+      "[SLAVE_BUILD]/dynamorio/build/bin64/drrun",
       "-stderr_mask",
       "12",
       "--",
       "../../linux-cr-builder/build/src/out/Release/crypto_unittests"
     ],
-    "cwd": "[CWD]/dynamorio",
+    "cwd": "[SLAVE_BUILD]/dynamorio",
     "env": {
       "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
     },
     "name": "crypto_unittests"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
-      "[CWD]/dynamorio/build/bin64/drrun",
+      "[SLAVE_BUILD]/dynamorio/build/bin64/drrun",
       "-stderr_mask",
       "12",
       "--",
       "../../linux-cr-builder/build/src/out/Release/ipc_tests"
     ],
-    "cwd": "[CWD]/dynamorio",
+    "cwd": "[SLAVE_BUILD]/dynamorio",
     "env": {
       "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
     },
     "name": "ipc_tests"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
-      "[CWD]/dynamorio/build/bin64/drrun",
+      "[SLAVE_BUILD]/dynamorio/build/bin64/drrun",
       "-stderr_mask",
       "12",
       "--",
       "../../linux-cr-builder/build/src/out/Release/media_unittests"
     ],
-    "cwd": "[CWD]/dynamorio",
+    "cwd": "[SLAVE_BUILD]/dynamorio",
     "env": {
       "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
     },
     "name": "media_unittests"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
-      "[CWD]/dynamorio/build/bin64/drrun",
+      "[SLAVE_BUILD]/dynamorio/build/bin64/drrun",
       "-stderr_mask",
       "12",
       "--",
       "../../linux-cr-builder/build/src/out/Release/net_unittests",
       "--gtest_filter=-CertDatabaseNSSTest.ImportCACertHierarchy*"
     ],
-    "cwd": "[CWD]/dynamorio",
+    "cwd": "[SLAVE_BUILD]/dynamorio",
     "env": {
       "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
     },
     "name": "net_unittests"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
-      "[CWD]/dynamorio/build/bin64/drrun",
+      "[SLAVE_BUILD]/dynamorio/build/bin64/drrun",
       "-stderr_mask",
       "12",
       "--",
       "../../linux-cr-builder/build/src/out/Release/printing_unittests"
     ],
-    "cwd": "[CWD]/dynamorio",
+    "cwd": "[SLAVE_BUILD]/dynamorio",
     "env": {
       "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
     },
     "name": "printing_unittests"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
-      "[CWD]/dynamorio/build/bin64/drrun",
+      "[SLAVE_BUILD]/dynamorio/build/bin64/drrun",
       "-stderr_mask",
       "12",
       "--",
       "../../linux-cr-builder/build/src/out/Release/remoting_unittests",
       "--gtest_filter=-VideoFrameCapturerTest.Capture:DesktopProcessTest.DeathTest"
     ],
-    "cwd": "[CWD]/dynamorio",
+    "cwd": "[SLAVE_BUILD]/dynamorio",
     "env": {
       "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
     },
     "name": "remoting_unittests"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
-      "[CWD]/dynamorio/build/bin64/drrun",
+      "[SLAVE_BUILD]/dynamorio/build/bin64/drrun",
       "-stderr_mask",
       "12",
       "--",
       "../../linux-cr-builder/build/src/out/Release/sql_unittests"
     ],
-    "cwd": "[CWD]/dynamorio",
+    "cwd": "[SLAVE_BUILD]/dynamorio",
     "env": {
       "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
     },
     "name": "sql_unittests"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
-      "[CWD]/dynamorio/build/bin64/drrun",
+      "[SLAVE_BUILD]/dynamorio/build/bin64/drrun",
       "-stderr_mask",
       "12",
       "--",
       "../../linux-cr-builder/build/src/out/Release/unit_tests"
     ],
-    "cwd": "[CWD]/dynamorio",
+    "cwd": "[SLAVE_BUILD]/dynamorio",
     "env": {
       "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
     },
     "name": "unit_tests"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
-      "[CWD]/dynamorio/build/bin64/drrun",
+      "[SLAVE_BUILD]/dynamorio/build/bin64/drrun",
       "-stderr_mask",
       "12",
       "--",
       "../../linux-cr-builder/build/src/out/Release/url_unittests"
     ],
-    "cwd": "[CWD]/dynamorio",
+    "cwd": "[SLAVE_BUILD]/dynamorio",
     "env": {
       "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox"
     },
     "name": "url_unittests"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]