tryserver.chromium.android: convert chromium_trybot builders to remote_run

scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_coverage.json

 [
   {
     "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",
-      "[BUILDER_CACHE]/android_coverage",
+      "[BUILDER_CACHE]/android",
       "511"
     ],
     "name": "makedirs checkout path",
     "~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):@@@",
@@ skipping 27 matching lines @@
       "--patchset",
       "1",
       "--rietveld_server",
       "https://codereview.chromium.org",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
       "src@HEAD",
       "--output_manifest"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "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 120 matching lines @@
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage/src",
+    "cwd": "[BUILDER_CACHE]/android/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "GYP_CHROMIUM_NO_ACTION": "1",
       "GYP_CROSSCOMPILE": "1",
       "GYP_DEFINES": "OS=android component=static_library dcheck_always_on=1 emma_coverage=1 emma_filter='org.chromium.*' fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm use_goma=1",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks (with patch)"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/android_coverage/src/testing/scripts/get_compile_targets.py",
+      "[BUILDER_CACHE]/android/src/testing/scripts/get_compile_targets.py",
       "--output",
       "/path/to/tmp/json",
       "--",
       "--build-config-fs",
       "Debug",
       "--paths",
-      "{\"checkout\": \"[BUILDER_CACHE]/android_coverage/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
+      "{\"checkout\": \"[BUILDER_CACHE]/android/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
       "--properties",
       "{\"buildername\": \"android_coverage\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
     ],
     "name": "get compile targets for scripts",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[BUILDER_CACHE]/android_coverage/src/testing/buildbot/chromium.fyi.json",
+      "[BUILDER_CACHE]/android/src/testing/buildbot/chromium.fyi.json",
       "/path/to/tmp/json"
     ],
     "name": "read test spec (chromium.fyi.json)",
     "~followup_annotations": [
-      "@@@STEP_TEXT@path: [BUILDER_CACHE]/android_coverage/src/testing/buildbot/chromium.fyi.json@@@",
+      "@@@STEP_TEXT@path: [BUILDER_CACHE]/android/src/testing/buildbot/chromium.fyi.json@@@",
       "@@@STEP_LOG_LINE@json.output@{}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "git",
       "diff",
       "--cached",
       "--name-only"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage/src",
+    "cwd": "[BUILDER_CACHE]/android/src",
     "name": "git diff to analyze patch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@files@foo.cc@@@",
       "@@@STEP_LOG_END@files@@@",
       "@@@SET_BUILD_PROPERTY@subproject_tag@\"chromium\"@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[BUILDER_CACHE]/android_coverage/src/testing/buildbot/trybot_analyze_config.json",
+      "[BUILDER_CACHE]/android/src/testing/buildbot/trybot_analyze_config.json",
       "/path/to/tmp/json"
     ],
     "name": "read filter exclusion spec",
     "~followup_annotations": [
       "@@@STEP_TEXT@path: 'testing/buildbot/trybot_analyze_config.json'@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"exclusions\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      \"f.*\"@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ skipping 55 matching lines @@
       "python",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
     ],
     "name": "cleanup_temp"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n  os.remove(sys.argv[3])\nexcept OSError:\n  pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n  for f in files:\n    if f.endswith('.pyc'):\n      os.remove(os.path.join(base, f))\n",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/debug_info_dumps",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/test_logs",
-      "[BUILDER_CACHE]/android_coverage/src/out/build_product.zip",
-      "[BUILDER_CACHE]/android_coverage/src"
+      "[BUILDER_CACHE]/android/src/out/Debug/debug_info_dumps",
+      "[BUILDER_CACHE]/android/src/out/Debug/test_logs",
+      "[BUILDER_CACHE]/android/src/out/build_product.zip",
+      "[BUILDER_CACHE]/android/src"
     ],
     "name": "clean local files",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@",
       "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@",
       "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@",
       "@@@STEP_LOG_LINE@python.inline@try:@@@",
       "@@@STEP_LOG_LINE@python.inline@  os.remove(sys.argv[3])@@@",
       "@@@STEP_LOG_LINE@python.inline@except OSError:@@@",
       "@@@STEP_LOG_LINE@python.inline@  pass@@@",
       "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv[4]):@@@",
       "@@@STEP_LOG_LINE@python.inline@  for f in files:@@@",
       "@@@STEP_LOG_LINE@python.inline@    if f.endswith('.pyc'):@@@",
       "@@@STEP_LOG_LINE@python.inline@      os.remove(os.path.join(base, f))@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "allow_subannotations": false,
     "cmd": [
-      "[BUILDER_CACHE]/android_coverage/src/build/tree_truth.sh",
-      "[BUILDER_CACHE]/android_coverage/src",
+      "[BUILDER_CACHE]/android/src/build/tree_truth.sh",
+      "[BUILDER_CACHE]/android/src",
       "src"
     ],
     "name": "tree truth steps"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/android_coverage/src/tools/mb/mb.py",
+      "[BUILDER_CACHE]/android/src/tools/mb/mb.py",
       "gen",
       "-m",
       "tryserver.chromium.android",
       "-b",
       "android_coverage",
       "--config-file",
-      "[BUILDER_CACHE]/android_coverage/src/tools/mb/mb_config.pyl",
+      "[BUILDER_CACHE]/android/src/tools/mb/mb_config.pyl",
       "--goma-dir",
       "[CACHE]/cipd/goma",
       "//out/Debug"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage/src",
+    "cwd": "[BUILDER_CACHE]/android/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
     "name": "generate_build_files (with patch)"
   },
   {
     "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",
       "--target",
       "Debug",
       "--src-dir",
-      "[BUILDER_CACHE]/android_coverage/src",
+      "[BUILDER_CACHE]/android/src",
       "--goma-cache-dir",
       "[GOMA_CACHE]",
       "--goma-deps-cache-dir",
       "[GOMA_DEPS_CACHE]",
       "--compiler",
       "goma",
       "--goma-jsonstatus",
       "/path/to/tmp/json",
       "--goma-service-account-json-file",
       "/creds/service_accounts/service-account-goma-client.json",
       "--goma-dir",
       "[CACHE]/cipd/goma",
       "--goma-fail-fast",
       "--goma-disable-local-fallback",
       "--",
       "android_webview_test_apk",
       "chrome_public_test_apk",
       "chrome_sync_shell_test_apk",
       "content_shell_test_apk"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "compile (with patch)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
       "@@@STEP_LOG_END@json.output (invalid)@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "import sys; sys.exit(0)"
     ],
     "name": "mark: before_tests"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::adb]/resources/list_devices.py",
-      "['[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
+      "['[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
       "/path/to/tmp/json"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "List adb devices",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@[@@@",
       "@@@STEP_LOG_LINE@json.output@  \"014E1F310401C009\"@@@",
       "@@@STEP_LOG_LINE@json.output@]@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport subprocess\nimport sys\nadb_path = sys.argv[1]\nfor device in sys.argv[2:]:\n  print 'Attempting to root device %s ...' % (device)\n  subprocess.check_call([adb_path, '-s', device, 'root'])\n  subprocess.check_call([adb_path, '-s', device, 'wait-for-device'])\n  print 'Finished rooting device %s' % (device)\n",
-      "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools/adb",
+      "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb",
       "014E1F310401C009"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "Root devices",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
       "@@@STEP_LOG_LINE@python.inline@import sys@@@",
       "@@@STEP_LOG_LINE@python.inline@adb_path = sys.argv[1]@@@",
       "@@@STEP_LOG_LINE@python.inline@for device in sys.argv[2:]:@@@",
       "@@@STEP_LOG_LINE@python.inline@  print 'Attempting to root device %s ...' % (device)@@@",
       "@@@STEP_LOG_LINE@python.inline@  subprocess.check_call([adb_path, '-s', device, 'root'])@@@",
       "@@@STEP_LOG_LINE@python.inline@  subprocess.check_call([adb_path, '-s', device, 'wait-for-device'])@@@",
       "@@@STEP_LOG_LINE@python.inline@  print 'Finished rooting device %s' % (device)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/android_coverage/src/build/symlink.py",
+      "[BUILDER_CACHE]/android/src/build/symlink.py",
       "-f",
-      "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools/adb",
+      "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb",
       "~/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "create adb symlink"
   },
   {
     "cmd": [
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
       "--",
-      "[BUILDER_CACHE]/android_coverage/src/build/android/adb_logcat_monitor.py",
-      "[BUILDER_CACHE]/android_coverage/src/out/logcat",
-      "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools/adb"
+      "[BUILDER_CACHE]/android/src/build/android/adb_logcat_monitor.py",
+      "[BUILDER_CACHE]/android/src/out/logcat",
+      "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "spawn_logcat_monitor"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",
       "--verbose",
       "--adb-path",
-      "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools/adb"
+      "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "authorize_adb_devices"
   },
   {
     "cmd": [
-      "[BUILDER_CACHE]/android_coverage/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
+      "[BUILDER_CACHE]/android/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
       "--blacklist-file",
-      "[BUILDER_CACHE]/android_coverage/src/out/bad_devices.json",
+      "[BUILDER_CACHE]/android/src/out/bad_devices.json",
       "--known-devices-file",
       "[HOME]/.android/known_devices.json",
       "--adb-path",
-      "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools/adb",
+      "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb",
       "-v"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "device_recovery"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/android_coverage/src/build/android/provision_devices.py",
+      "[BUILDER_CACHE]/android/src/build/android/provision_devices.py",
       "--adb-path",
-      "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools/adb",
+      "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb",
       "--blacklist-file",
-      "[BUILDER_CACHE]/android_coverage/src/out/bad_devices.json",
+      "[BUILDER_CACHE]/android/src/out/bad_devices.json",
       "--output-device-blacklist",
       "/path/to/tmp/json",
       "-t",
       "Debug"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "provision_devices"
   },
   {
     "cmd": [
-      "[BUILDER_CACHE]/android_coverage/src/third_party/catapult/devil/devil/android/tools/device_status.py",
+      "[BUILDER_CACHE]/android/src/third_party/catapult/devil/devil/android/tools/device_status.py",
       "--json-output",
       "/path/to/tmp/json",
       "--blacklist-file",
-      "[BUILDER_CACHE]/android_coverage/src/out/bad_devices.json",
+      "[BUILDER_CACHE]/android/src/out/bad_devices.json",
       "--known-devices-file",
       "[HOME]/.android/known_devices.json",
       "--buildbot-path",
       "/home/chrome-bot/.adb_device_info",
       "--adb-path",
-      "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools/adb",
+      "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb",
       "-v",
       "--overwrite-known-devices-files"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "device_status",
     "~followup_annotations": [
       "@@@STEP_TEXT@Online devices: 1@@@",
       "@@@STEP_LOG_LINE@json.output@[@@@",
       "@@@STEP_LOG_LINE@json.output@  {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"adb_status\": \"device\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"battery\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"AC powered\": \"false\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"USB powered\": \"true\", @@@",
@@ skipping 88 matching lines @@
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
       "--action",
       "restart",
       "--pid-file-path",
       "/tmp/device_monitor.pid",
       "--",
       "RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py",
-      "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools/adb",
+      "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb",
       "[\"07a00ca4\"]",
       "--blacklist-file",
-      "[BUILDER_CACHE]/android_coverage/src/out/bad_devices.json"
+      "[BUILDER_CACHE]/android/src/out/bad_devices.json"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "spawn_device_monitor"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/bin/run_android_webview_test_apk",
+      "[BUILDER_CACHE]/android/src/out/Debug/bin/run_android_webview_test_apk",
       "--blacklist-file",
-      "[BUILDER_CACHE]/android_coverage/src/out/bad_devices.json",
+      "[BUILDER_CACHE]/android/src/out/bad_devices.json",
       "--verbose",
       "--coverage-dir",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/coverage",
+      "[BUILDER_CACHE]/android/src/out/Debug/coverage",
       "--json-results-file",
       "/path/to/tmp/json",
       "--adb-path",
-      "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools/adb"
+      "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "AndroidWebViewTest (with patch)",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
       "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
       "@@@STEP_FAILURE@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py",
       "--input-gtest-json",
       "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"FAILURE\"}]}]}",
       "--master-name",
       "tryserver.chromium.android",
       "--builder-name",
       "android_coverage",
       "--build-number",
       "571",
       "--test-type",
       "AndroidWebViewTest",
       "--test-results-server",
       "test-results.appspot.com",
       "--chrome-revision",
       "refs/heads/master@{#170242}"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "Upload to test-results [AndroidWebViewTest]"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/bin/run_chrome_public_test_apk",
+      "[BUILDER_CACHE]/android/src/out/Debug/bin/run_chrome_public_test_apk",
       "--blacklist-file",
-      "[BUILDER_CACHE]/android_coverage/src/out/bad_devices.json",
+      "[BUILDER_CACHE]/android/src/out/bad_devices.json",
       "--verbose",
       "--coverage-dir",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/coverage",
+      "[BUILDER_CACHE]/android/src/out/Debug/coverage",
       "--json-results-file",
       "/path/to/tmp/json",
       "--adb-path",
-      "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools/adb"
+      "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "ChromePublicTest (with patch)",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
       "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
       "@@@STEP_FAILURE@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py",
       "--input-gtest-json",
       "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"FAILURE\"}]}]}",
       "--master-name",
       "tryserver.chromium.android",
       "--builder-name",
       "android_coverage",
       "--build-number",
       "571",
       "--test-type",
       "ChromePublicTest",
       "--test-results-server",
       "test-results.appspot.com",
       "--chrome-revision",
       "refs/heads/master@{#170242}"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "Upload to test-results [ChromePublicTest]"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/bin/run_content_shell_test_apk",
+      "[BUILDER_CACHE]/android/src/out/Debug/bin/run_content_shell_test_apk",
       "--blacklist-file",
-      "[BUILDER_CACHE]/android_coverage/src/out/bad_devices.json",
+      "[BUILDER_CACHE]/android/src/out/bad_devices.json",
       "--verbose",
       "--coverage-dir",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/coverage",
+      "[BUILDER_CACHE]/android/src/out/Debug/coverage",
       "--json-results-file",
       "/path/to/tmp/json",
       "--adb-path",
-      "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools/adb"
+      "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "ContentShellTest (with patch)",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
       "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
       "@@@STEP_FAILURE@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py",
       "--input-gtest-json",
       "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"FAILURE\"}]}]}",
       "--master-name",
       "tryserver.chromium.android",
       "--builder-name",
       "android_coverage",
       "--build-number",
       "571",
       "--test-type",
       "ContentShellTest",
       "--test-results-server",
       "test-results.appspot.com",
       "--chrome-revision",
       "refs/heads/master@{#170242}"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "Upload to test-results [ContentShellTest]"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/bin/run_chrome_sync_shell_test_apk",
+      "[BUILDER_CACHE]/android/src/out/Debug/bin/run_chrome_sync_shell_test_apk",
       "--blacklist-file",
-      "[BUILDER_CACHE]/android_coverage/src/out/bad_devices.json",
+      "[BUILDER_CACHE]/android/src/out/bad_devices.json",
       "--verbose",
       "--coverage-dir",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/coverage",
+      "[BUILDER_CACHE]/android/src/out/Debug/coverage",
       "--json-results-file",
       "/path/to/tmp/json",
       "--adb-path",
-      "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools/adb"
+      "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "ChromeSyncShellTest (with patch)",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
       "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
       "@@@STEP_FAILURE@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py",
       "--input-gtest-json",
       "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"FAILURE\"}]}]}",
       "--master-name",
       "tryserver.chromium.android",
       "--builder-name",
       "android_coverage",
       "--build-number",
       "571",
       "--test-type",
       "ChromeSyncShellTest",
       "--test-results-server",
       "test-results.appspot.com",
       "--chrome-revision",
       "refs/heads/master@{#170242}"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "Upload to test-results [ChromeSyncShellTest]"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/android_coverage/src/build/android/generate_emma_html.py",
+      "[BUILDER_CACHE]/android/src/build/android/generate_emma_html.py",
       "--coverage-dir",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/coverage",
+      "[BUILDER_CACHE]/android/src/out/Debug/coverage",
       "--metadata-dir",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug",
+      "[BUILDER_CACHE]/android/src/out/Debug",
       "--cleanup",
       "--output",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/coverage/coverage_html/index.html"
+      "[BUILDER_CACHE]/android/src/out/Debug/coverage/coverage_html/index.html"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "Generate coverage report"
   },
   {
     "cmd": [
       "git",
       "diff",
       "--staged",
       "--name-only",
       "--diff-filter",
       "A"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage/src",
+    "cwd": "[BUILDER_CACHE]/android/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "Finding changed files matching diff filter: A",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "fake/file1.java",
       "/path/to/tmp/"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "Finding lines changed in added file fake/file1.java"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "fake/file2.java;",
       "/path/to/tmp/"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "Finding lines changed in added file fake/file2.java;"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "fake/file3.java",
       "/path/to/tmp/"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "Finding lines changed in added file fake/file3.java"
   },
   {
     "cmd": [
       "git",
       "diff",
       "--staged",
       "--name-only",
       "--diff-filter",
       "M"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage/src",
+    "cwd": "[BUILDER_CACHE]/android/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "Finding changed files matching diff filter: M",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
       "git",
       "blame",
       "-l",
       "-s",
       "fake/file1.java"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage/src",
+    "cwd": "[BUILDER_CACHE]/android/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "Finding lines changed in modified file fake/file1.java",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
       "git",
       "blame",
       "-l",
       "-s",
       "fake/file2.java;"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage/src",
+    "cwd": "[BUILDER_CACHE]/android/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "Finding lines changed in modified file fake/file2.java;",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
       "git",
       "blame",
       "-l",
       "-s",
       "fake/file3.java"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage/src",
+    "cwd": "[BUILDER_CACHE]/android/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "Finding lines changed in modified file fake/file3.java",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "{\"fake/file1.java\": [], \"fake/file2.java;\": [], \"fake/file3.java\": []}",
       "[TMP_BASE]/coverage_tmp_1/file_changes.json"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "Saving changed lines for revision."
   },
   {
     "cmd": [
       "python",
       "-u",
       "build/android/emma_coverage_stats.py",
       "-v",
       "--out",
       "/path/to/tmp/json",
       "--emma-dir",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/coverage/coverage_html",
+      "[BUILDER_CACHE]/android/src/out/Debug/coverage/coverage_html",
       "--lines-for-coverage",
       "[TMP_BASE]/coverage_tmp_1/file_changes.json"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage/src",
+    "cwd": "[BUILDER_CACHE]/android/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "Incremental coverage report",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"files\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"sample file 1\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"absolute\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"covered\": 70, @@@",
       "@@@STEP_LOG_LINE@json.output@        \"total\": 100@@@",
       "@@@STEP_LOG_LINE@json.output@      }, @@@",
@@ skipping 46 matching lines @@
       "[GIT_CACHE]",
       "--rietveld_server",
       "https://codereview.chromium.org",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
       "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--force",
       "--output_manifest"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "bot_update (without patch)",
     "~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\": {@@@",
@@ skipping 53 matching lines @@
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage/src",
+    "cwd": "[BUILDER_CACHE]/android/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "GYP_CHROMIUM_NO_ACTION": "1",
       "GYP_CROSSCOMPILE": "1",
       "GYP_DEFINES": "OS=android component=static_library dcheck_always_on=1 emma_coverage=1 emma_filter='org.chromium.*' fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm use_goma=1",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks (without patch)"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/android_coverage/src/tools/mb/mb.py",
+      "[BUILDER_CACHE]/android/src/tools/mb/mb.py",
       "gen",
       "-m",
       "tryserver.chromium.android",
       "-b",
       "android_coverage",
       "--config-file",
-      "[BUILDER_CACHE]/android_coverage/src/tools/mb/mb_config.pyl",
+      "[BUILDER_CACHE]/android/src/tools/mb/mb_config.pyl",
       "--goma-dir",
       "[CACHE]/cipd/goma",
       "//out/Debug"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage/src",
+    "cwd": "[BUILDER_CACHE]/android/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "generate_build_files (without patch)"
   },
   {
     "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",
       "--target",
       "Debug",
       "--src-dir",
-      "[BUILDER_CACHE]/android_coverage/src",
+      "[BUILDER_CACHE]/android/src",
       "--goma-cache-dir",
       "[GOMA_CACHE]",
       "--goma-deps-cache-dir",
       "[GOMA_DEPS_CACHE]",
       "--compiler",
       "goma",
       "--goma-jsonstatus",
       "/path/to/tmp/json",
       "--goma-service-account-json-file",
       "/creds/service_accounts/service-account-goma-client.json",
       "--goma-dir",
       "[CACHE]/cipd/goma",
       "--goma-fail-fast",
       "--goma-disable-local-fallback",
       "--",
       "android_webview_test_apk",
       "chrome_public_test_apk",
       "chrome_sync_shell_test_apk",
       "content_shell_test_apk"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "compile (without patch)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
       "@@@STEP_LOG_END@json.output (invalid)@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/bin/run_android_webview_test_apk",
+      "[BUILDER_CACHE]/android/src/out/Debug/bin/run_android_webview_test_apk",
       "--blacklist-file",
-      "[BUILDER_CACHE]/android_coverage/src/out/bad_devices.json",
+      "[BUILDER_CACHE]/android/src/out/bad_devices.json",
       "--verbose",
       "--coverage-dir",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/coverage",
+      "[BUILDER_CACHE]/android/src/out/Debug/coverage",
       "--json-results-file",
       "/path/to/tmp/json",
       "--adb-path",
-      "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools/adb"
+      "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "AndroidWebViewTest (without patch)",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
       "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
       "@@@STEP_FAILURE@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py",
       "--input-gtest-json",
       "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"FAILURE\"}]}]}",
       "--master-name",
       "tryserver.chromium.android",
       "--builder-name",
       "android_coverage",
       "--build-number",
       "571",
       "--test-type",
       "AndroidWebViewTest",
       "--test-results-server",
       "test-results.appspot.com",
       "--chrome-revision",
       "refs/heads/master@{#170242}"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "Upload to test-results [AndroidWebViewTest] (2)"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/bin/run_chrome_public_test_apk",
+      "[BUILDER_CACHE]/android/src/out/Debug/bin/run_chrome_public_test_apk",
       "--blacklist-file",
-      "[BUILDER_CACHE]/android_coverage/src/out/bad_devices.json",
+      "[BUILDER_CACHE]/android/src/out/bad_devices.json",
       "--verbose",
       "--coverage-dir",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/coverage",
+      "[BUILDER_CACHE]/android/src/out/Debug/coverage",
       "--json-results-file",
       "/path/to/tmp/json",
       "--adb-path",
-      "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools/adb"
+      "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "ChromePublicTest (without patch)",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
       "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
       "@@@STEP_FAILURE@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py",
       "--input-gtest-json",
       "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"FAILURE\"}]}]}",
       "--master-name",
       "tryserver.chromium.android",
       "--builder-name",
       "android_coverage",
       "--build-number",
       "571",
       "--test-type",
       "ChromePublicTest",
       "--test-results-server",
       "test-results.appspot.com",
       "--chrome-revision",
       "refs/heads/master@{#170242}"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "Upload to test-results [ChromePublicTest] (2)"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/bin/run_content_shell_test_apk",
+      "[BUILDER_CACHE]/android/src/out/Debug/bin/run_content_shell_test_apk",
       "--blacklist-file",
-      "[BUILDER_CACHE]/android_coverage/src/out/bad_devices.json",
+      "[BUILDER_CACHE]/android/src/out/bad_devices.json",
       "--verbose",
       "--coverage-dir",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/coverage",
+      "[BUILDER_CACHE]/android/src/out/Debug/coverage",
       "--json-results-file",
       "/path/to/tmp/json",
       "--adb-path",
-      "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools/adb"
+      "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "ContentShellTest (without patch)",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
       "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
       "@@@STEP_FAILURE@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py",
       "--input-gtest-json",
       "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"FAILURE\"}]}]}",
       "--master-name",
       "tryserver.chromium.android",
       "--builder-name",
       "android_coverage",
       "--build-number",
       "571",
       "--test-type",
       "ContentShellTest",
       "--test-results-server",
       "test-results.appspot.com",
       "--chrome-revision",
       "refs/heads/master@{#170242}"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "Upload to test-results [ContentShellTest] (2)"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/bin/run_chrome_sync_shell_test_apk",
+      "[BUILDER_CACHE]/android/src/out/Debug/bin/run_chrome_sync_shell_test_apk",
       "--blacklist-file",
-      "[BUILDER_CACHE]/android_coverage/src/out/bad_devices.json",
+      "[BUILDER_CACHE]/android/src/out/bad_devices.json",
       "--verbose",
       "--coverage-dir",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/coverage",
+      "[BUILDER_CACHE]/android/src/out/Debug/coverage",
       "--json-results-file",
       "/path/to/tmp/json",
       "--adb-path",
-      "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools/adb"
+      "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "ChromeSyncShellTest (without patch)",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
       "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
       "@@@STEP_FAILURE@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py",
       "--input-gtest-json",
       "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"FAILURE\"}]}]}",
       "--master-name",
       "tryserver.chromium.android",
       "--builder-name",
       "android_coverage",
       "--build-number",
       "571",
       "--test-type",
       "ChromeSyncShellTest",
       "--test-results-server",
       "test-results.appspot.com",
       "--chrome-revision",
       "refs/heads/master@{#170242}"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "Upload to test-results [ChromeSyncShellTest] (2)"
   },
   {
     "cmd": [
       "python",
       "-u",
       "import sys; sys.exit(0)"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "AndroidWebViewTest (retry summary)",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>ignored:<br/>Test.Two<br/>@@@",
       "@@@STEP_WARNINGS@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "import sys; sys.exit(0)"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "ChromePublicTest (retry summary)",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>ignored:<br/>Test.Two<br/>@@@",
       "@@@STEP_WARNINGS@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "import sys; sys.exit(0)"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "ContentShellTest (retry summary)",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>ignored:<br/>Test.Two<br/>@@@",
       "@@@STEP_WARNINGS@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "import sys; sys.exit(0)"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "ChromeSyncShellTest (retry summary)",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>ignored:<br/>Test.Two<br/>@@@",
       "@@@STEP_WARNINGS@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
       "--action",
       "stop",
       "--pid-file-path",
       "/tmp/device_monitor.pid"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "shutdown_device_monitor"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/android_coverage/src/build/android/adb_logcat_printer.py",
+      "[BUILDER_CACHE]/android/src/build/android/adb_logcat_printer.py",
       "--output-path",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/full_log",
-      "[BUILDER_CACHE]/android_coverage/src/out/logcat"
+      "[BUILDER_CACHE]/android/src/out/Debug/full_log",
+      "[BUILDER_CACHE]/android/src/out/logcat"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "logcat_dump"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "--force-version",
       "4.7",
       "-o",
       "GSUtil:parallel_composite_upload_threshold=50M",
       "----",
       "cp",
       "-a",
       "public-read",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/full_log",
+      "[BUILDER_CACHE]/android/src/out/Debug/full_log",
       "gs://chromium-android/logcat_dumps/android_coverage/571"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "gsutil upload",
     "~followup_annotations": [
       "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/android_coverage/571@@@"
     ]
   },
   {
     "cmd": [
-      "[BUILDER_CACHE]/android_coverage/src/third_party/android_platform/development/scripts/stack",
+      "[BUILDER_CACHE]/android/src/third_party/android_platform/development/scripts/stack",
       "--arch",
       "arm",
       "--more-info",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/full_log"
+      "[BUILDER_CACHE]/android/src/out/Debug/full_log"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
-      "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android_coverage/src/out/Debug",
+      "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android/src/out/Debug",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "stack_tool_with_logcat_dump"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[BUILDER_CACHE]/android_coverage/src/chrome/VERSION",
+      "[BUILDER_CACHE]/android/src/chrome/VERSION",
       "/path/to/tmp/"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "get version"
   },
   {
     "cmd": [
-      "[BUILDER_CACHE]/android_coverage/src/build/android/tombstones.py",
+      "[BUILDER_CACHE]/android/src/build/android/tombstones.py",
       "-a",
       "-s",
       "-w"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
-      "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android_coverage/src/out/Debug",
+      "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android/src/out/Debug",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "stack_tool_for_tombstones"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n  with open(report, 'r') as f:\n    for l in f.readlines():\n      print l\n  os.remove(report)\n",
-      "[BUILDER_CACHE]/android_coverage/src/out/Debug/test_logs/*.log"
+      "[BUILDER_CACHE]/android/src/out/Debug/test_logs/*.log"
     ],
-    "cwd": "[BUILDER_CACHE]/android_coverage",
+    "cwd": "[BUILDER_CACHE]/android",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_coverage/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_coverage/src/build/android:%(PATH)s"
+      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
     },
     "name": "test_report",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import glob, os, sys@@@",
       "@@@STEP_LOG_LINE@python.inline@for report in glob.glob(sys.argv[1]):@@@",
       "@@@STEP_LOG_LINE@python.inline@  with open(report, 'r') as f:@@@",
       "@@@STEP_LOG_LINE@python.inline@    for l in f.readlines():@@@",
       "@@@STEP_LOG_LINE@python.inline@      print l@@@",
       "@@@STEP_LOG_LINE@python.inline@  os.remove(report)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]