Revert "build: roll infra_paths changes"

scripts/slave/recipes/mojo.expected/mojo_android_builder.json

Index: scripts/slave/recipes/mojo.expected/mojo_android_builder.json
diff --git a/scripts/slave/recipes/mojo.expected/mojo_android_builder.json b/scripts/slave/recipes/mojo.expected/mojo_android_builder.json
index 6da2cccd17b31e861e323a0a1ddc611adad3d60a..f9e1a8e9ce90e34643d7f79e0e412fd385d1fc31 100644
--- a/scripts/slave/recipes/mojo.expected/mojo_android_builder.json
+++ b/scripts/slave/recipes/mojo.expected/mojo_android_builder.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/mojo.git'}]\ntarget_os = ['android']",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/mojo.git'}]\ntarget_os = ['android']",
       "--root",
       "src",
       "--revision_mapping_file",
       "{}",
       "--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]"
     },
@@ -53,6 +54,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -62,14 +64,14 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/mojo/tools/mojob.py",
+      "[SLAVE_BUILD]/src/mojo/tools/mojob.py",
       "gn",
       "--release",
       "--android"
     ],
-    "cwd": "[CWD]/src",
+    "cwd": "[SLAVE_BUILD]/src",
     "env": {
-      "GOMA_DIR": "[ROOT]/b/build/goma"
+      "GOMA_DIR": "[BUILD]/goma"
     },
     "name": "mojob gn"
   },
@@ -77,13 +79,14 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/mojo/tools/mojob.py",
+      "[SLAVE_BUILD]/src/mojo/tools/mojob.py",
       "build",
       "--release",
       "--android"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
-      "GOMA_DIR": "[ROOT]/b/build/goma"
+      "GOMA_DIR": "[BUILD]/goma"
     },
     "name": "mojob build"
   },
@@ -91,9 +94,10 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/mojo/tools/upload_binaries.py",
+      "[SLAVE_BUILD]/src/mojo/tools/upload_binaries.py",
       "--android"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "upload shell and app binaries"
   },
   {