Revert "[Android] Add context manager to record logcat during step(s)."

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

 [
   {
     "cmd": [
       "python",
       "-u",
       "[BUILD]/scripts/slave/bot_update.py",
       "--master",
       "tryserver.chromium.linux",
       "--builder",
       "android_amp",
@@ skipping 413 matching lines @@
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
       "@@@STEP_LOG_END@json.output (invalid)@@@"
     ]
   },
   {
     "cmd": [
       "[BUILD]/scripts/slave/daemonizer.py",
       "--",
       "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
-      "[SLAVE_BUILD]/src/out/logcat_dir"
+      "[SLAVE_BUILD]/src/out/logcat"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
     "name": "spawn_logcat_monitor"
   },
   {
     "cmd": [
       "python",
@@ skipping 808 matching lines @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
       "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] save ui_touch_selection_unittests (with patch)"
   },
   {
-    "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "AndroidWebViewTest"
-  },
-  {
-    "cmd": [
-      "[BUILD]/scripts/slave/daemonizer.py",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
-      "[TMP_BASE]/logcat_tmp_2"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "env": {
-      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
-    },
-    "name": "AndroidWebViewTest.spawn_logcat_monitor",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
     "cmd": [
       "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
       "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebView.apk",
       "-v",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--release"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "AndroidWebViewTest.install AndroidWebView.apk",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
+    "name": "install AndroidWebView.apk"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/build/android/test_runner.py",
       "instrumentation",
       "--test-apk",
       "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebViewTest.apk",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--apk-under-test",
       "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebView.apk",
       "--isolate-file-path",
       "android_webview/android_webview_test_apk.isolate",
       "--flakiness-dashboard-server",
       "test-results.appspot.com",
       "--verbose",
       "--release",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
-    "name": "AndroidWebViewTest.Instrumentation test AndroidWebViewTest (with patch)",
+    "name": "Instrumentation test AndroidWebViewTest (with patch)",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
     ]
   },
   {
-    "cmd": [
-      "python",
-      "-u",
-      "[BUILD]/scripts/slave/tee.py",
-      "/path/to/tmp/logcat",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
-      "[TMP_BASE]/logcat_tmp_2"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "AndroidWebViewTest.logcat_dump",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "ContentShellTest"
-  },
-  {
-    "cmd": [
-      "[BUILD]/scripts/slave/daemonizer.py",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
-      "[TMP_BASE]/logcat_tmp_3"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "env": {
-      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
-    },
-    "name": "ContentShellTest.spawn_logcat_monitor",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
     "cmd": [
       "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
       "[SLAVE_BUILD]/src/out/Release/apks/ContentShell.apk",
       "-v",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--release"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "ContentShellTest.install ContentShell.apk",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
+    "name": "install ContentShell.apk"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/build/android/test_runner.py",
       "instrumentation",
       "--test-apk",
       "[SLAVE_BUILD]/src/out/Release/apks/ContentShellTest.apk",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--apk-under-test",
       "[SLAVE_BUILD]/src/out/Release/apks/ContentShell.apk",
       "--isolate-file-path",
       "content/content_shell_test_apk.isolate",
       "--flakiness-dashboard-server",
       "test-results.appspot.com",
       "--verbose",
       "--release",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
-    "name": "ContentShellTest.Instrumentation test ContentShellTest (with patch)",
+    "name": "Instrumentation test ContentShellTest (with patch)",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
     ]
   },
   {
-    "cmd": [
-      "python",
-      "-u",
-      "[BUILD]/scripts/slave/tee.py",
-      "/path/to/tmp/logcat",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
-      "[TMP_BASE]/logcat_tmp_3"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "ContentShellTest.logcat_dump",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "ChromePublicTest"
-  },
-  {
-    "cmd": [
-      "[BUILD]/scripts/slave/daemonizer.py",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
-      "[TMP_BASE]/logcat_tmp_4"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "env": {
-      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
-    },
-    "name": "ChromePublicTest.spawn_logcat_monitor",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
     "cmd": [
       "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
       "[SLAVE_BUILD]/src/out/Release/apks/ChromePublic.apk",
       "-v",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--release"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "ChromePublicTest.install ChromePublic.apk",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
+    "name": "install ChromePublic.apk"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/build/android/test_runner.py",
       "instrumentation",
       "--test-apk",
       "[SLAVE_BUILD]/src/out/Release/apks/ChromePublicTest.apk",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--apk-under-test",
       "[SLAVE_BUILD]/src/out/Release/apks/ChromePublic.apk",
       "--isolate-file-path",
       "chrome/chrome_public_test_apk.isolate",
       "--flakiness-dashboard-server",
       "test-results.appspot.com",
       "--verbose",
       "--release",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
-    "name": "ChromePublicTest.Instrumentation test ChromePublicTest (with patch)",
+    "name": "Instrumentation test ChromePublicTest (with patch)",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
     ]
   },
   {
-    "cmd": [
-      "python",
-      "-u",
-      "[BUILD]/scripts/slave/tee.py",
-      "/path/to/tmp/logcat",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
-      "[TMP_BASE]/logcat_tmp_4"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "ChromePublicTest.logcat_dump",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "ChromeSyncShellTest"
-  },
-  {
-    "cmd": [
-      "[BUILD]/scripts/slave/daemonizer.py",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
-      "[TMP_BASE]/logcat_tmp_5"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "env": {
-      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
-    },
-    "name": "ChromeSyncShellTest.spawn_logcat_monitor",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
     "cmd": [
       "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
       "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShell.apk",
       "-v",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--release"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "ChromeSyncShellTest.install ChromeSyncShell.apk",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
+    "name": "install ChromeSyncShell.apk"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/build/android/test_runner.py",
       "instrumentation",
       "--test-apk",
       "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShellTest.apk",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--apk-under-test",
       "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShell.apk",
       "--flakiness-dashboard-server",
       "test-results.appspot.com",
       "--verbose",
       "--release",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
-    "name": "ChromeSyncShellTest.Instrumentation test ChromeSyncShellTest (with patch)",
+    "name": "Instrumentation test ChromeSyncShellTest (with patch)",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILD]/scripts/slave/tee.py",
-      "/path/to/tmp/logcat",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
-      "[TMP_BASE]/logcat_tmp_5"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "ChromeSyncShellTest.logcat_dump",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "breakpad_unittests"
-  },
-  {
-    "cmd": [
-      "[BUILD]/scripts/slave/daemonizer.py",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
-      "[TMP_BASE]/logcat_tmp_6"
+      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "gtest",
+      "-s",
+      "breakpad_unittests",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--verbose",
+      "--release",
+      "--isolate_file_path=[SLAVE_BUILD]/src/breakpad/breakpad_unittests.isolate",
+      "--flakiness-dashboard-server=test-results.appspot.com",
+      "--json-results-file",
+      "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "breakpad_unittests.spawn_logcat_monitor",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
+    "name": "breakpad_unittests (with patch)"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/build/android/test_runner.py",
       "gtest",
       "-s",
-      "breakpad_unittests",
+      "cc_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--verbose",
       "--release",
-      "--isolate_file_path=[SLAVE_BUILD]/src/breakpad/breakpad_unittests.isolate",
       "--flakiness-dashboard-server=test-results.appspot.com",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "breakpad_unittests.breakpad_unittests (with patch)",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
+    "name": "cc_unittests (with patch)"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILD]/scripts/slave/tee.py",
-      "/path/to/tmp/logcat",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
-      "[TMP_BASE]/logcat_tmp_6"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "breakpad_unittests.logcat_dump",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "cc_unittests"
-  },
-  {
-    "cmd": [
-      "[BUILD]/scripts/slave/daemonizer.py",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
-      "[TMP_BASE]/logcat_tmp_7"
+      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "gtest",
+      "-s",
+      "content_browsertests",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--verbose",
+      "--release",
+      "--flakiness-dashboard-server=test-results.appspot.com",
+      "--json-results-file",
+      "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "cc_unittests.spawn_logcat_monitor",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
+    "name": "content_browsertests (with patch)"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/build/android/test_runner.py",
       "gtest",
       "-s",
-      "cc_unittests",
+      "content_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--verbose",
       "--release",
       "--flakiness-dashboard-server=test-results.appspot.com",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "cc_unittests.cc_unittests (with patch)",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
+    "name": "content_unittests (with patch)"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILD]/scripts/slave/tee.py",
-      "/path/to/tmp/logcat",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
-      "[TMP_BASE]/logcat_tmp_7"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "cc_unittests.logcat_dump",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "content_browsertests"
-  },
-  {
-    "cmd": [
-      "[BUILD]/scripts/slave/daemonizer.py",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
-      "[TMP_BASE]/logcat_tmp_8"
+      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "gtest",
+      "-s",
+      "gpu_unittests",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--verbose",
+      "--release",
+      "--flakiness-dashboard-server=test-results.appspot.com",
+      "--json-results-file",
+      "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "content_browsertests.spawn_logcat_monitor",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
+    "name": "gpu_unittests (with patch)"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/build/android/test_runner.py",
       "gtest",
       "-s",
-      "content_browsertests",
+      "media_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--verbose",
       "--release",
       "--flakiness-dashboard-server=test-results.appspot.com",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "content_browsertests.content_browsertests (with patch)",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
+    "name": "media_unittests (with patch)"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILD]/scripts/slave/tee.py",
-      "/path/to/tmp/logcat",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
-      "[TMP_BASE]/logcat_tmp_8"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "content_browsertests.logcat_dump",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "content_unittests"
-  },
-  {
-    "cmd": [
-      "[BUILD]/scripts/slave/daemonizer.py",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
-      "[TMP_BASE]/logcat_tmp_9"
+      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "gtest",
+      "-s",
+      "net_unittests",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--verbose",
+      "--release",
+      "--isolate_file_path=[SLAVE_BUILD]/src/net/net_unittests.isolate",
+      "--flakiness-dashboard-server=test-results.appspot.com",
+      "--json-results-file",
+      "/path/to/tmp/json",
+      "-t",
+      "300"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "content_unittests.spawn_logcat_monitor",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
+    "name": "net_unittests (with patch)"
   },
   {
     "cmd": [
+      "python",
+      "-u",
+      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "gtest",
+      "-s",
+      "sandbox_linux_unittests",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--verbose",
+      "--release",
+      "--flakiness-dashboard-server=test-results.appspot.com",
+      "--json-results-file",
+      "/path/to/tmp/json"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+    },
+    "name": "sandbox_linux_unittests (with patch)"
+  },
+  {
+    "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/build/android/test_runner.py",
       "gtest",
       "-s",
-      "content_unittests",
+      "ui_base_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--verbose",
       "--release",
       "--flakiness-dashboard-server=test-results.appspot.com",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "content_unittests.content_unittests (with patch)",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
+    "name": "ui_base_unittests (with patch)"
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "[BUILD]/scripts/slave/tee.py",
-      "/path/to/tmp/logcat",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
-      "[TMP_BASE]/logcat_tmp_9"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "content_unittests.logcat_dump",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "gpu_unittests"
-  },
-  {
-    "cmd": [
-      "[BUILD]/scripts/slave/daemonizer.py",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
-      "[TMP_BASE]/logcat_tmp_10"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "env": {
-      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
-    },
-    "name": "gpu_unittests.spawn_logcat_monitor",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
-      "gtest",
-      "-s",
-      "gpu_unittests",
-      "--blacklist-file",
-      "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--verbose",
-      "--release",
-      "--flakiness-dashboard-server=test-results.appspot.com",
-      "--json-results-file",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "env": {
-      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
-    },
-    "name": "gpu_unittests.gpu_unittests (with patch)",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[BUILD]/scripts/slave/tee.py",
-      "/path/to/tmp/logcat",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
-      "[TMP_BASE]/logcat_tmp_10"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "gpu_unittests.logcat_dump",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "media_unittests"
-  },
-  {
-    "cmd": [
-      "[BUILD]/scripts/slave/daemonizer.py",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
-      "[TMP_BASE]/logcat_tmp_11"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "env": {
-      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
-    },
-    "name": "media_unittests.spawn_logcat_monitor",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
-      "gtest",
-      "-s",
-      "media_unittests",
-      "--blacklist-file",
-      "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--verbose",
-      "--release",
-      "--flakiness-dashboard-server=test-results.appspot.com",
-      "--json-results-file",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "env": {
-      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
-    },
-    "name": "media_unittests.media_unittests (with patch)",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[BUILD]/scripts/slave/tee.py",
-      "/path/to/tmp/logcat",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
-      "[TMP_BASE]/logcat_tmp_11"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "media_unittests.logcat_dump",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "net_unittests"
-  },
-  {
-    "cmd": [
-      "[BUILD]/scripts/slave/daemonizer.py",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
-      "[TMP_BASE]/logcat_tmp_12"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "env": {
-      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
-    },
-    "name": "net_unittests.spawn_logcat_monitor",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
-      "gtest",
-      "-s",
-      "net_unittests",
-      "--blacklist-file",
-      "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--verbose",
-      "--release",
-      "--isolate_file_path=[SLAVE_BUILD]/src/net/net_unittests.isolate",
-      "--flakiness-dashboard-server=test-results.appspot.com",
-      "--json-results-file",
-      "/path/to/tmp/json",
-      "-t",
-      "300"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "env": {
-      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
-    },
-    "name": "net_unittests.net_unittests (with patch)",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[BUILD]/scripts/slave/tee.py",
-      "/path/to/tmp/logcat",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
-      "[TMP_BASE]/logcat_tmp_12"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "net_unittests.logcat_dump",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "sandbox_linux_unittests"
-  },
-  {
-    "cmd": [
-      "[BUILD]/scripts/slave/daemonizer.py",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
-      "[TMP_BASE]/logcat_tmp_13"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "env": {
-      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
-    },
-    "name": "sandbox_linux_unittests.spawn_logcat_monitor",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
-      "gtest",
-      "-s",
-      "sandbox_linux_unittests",
-      "--blacklist-file",
-      "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--verbose",
-      "--release",
-      "--flakiness-dashboard-server=test-results.appspot.com",
-      "--json-results-file",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "env": {
-      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
-    },
-    "name": "sandbox_linux_unittests.sandbox_linux_unittests (with patch)",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[BUILD]/scripts/slave/tee.py",
-      "/path/to/tmp/logcat",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
-      "[TMP_BASE]/logcat_tmp_13"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "sandbox_linux_unittests.logcat_dump",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "ui_base_unittests"
-  },
-  {
-    "cmd": [
-      "[BUILD]/scripts/slave/daemonizer.py",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
-      "[TMP_BASE]/logcat_tmp_14"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "env": {
-      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
-    },
-    "name": "ui_base_unittests.spawn_logcat_monitor",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
-      "gtest",
-      "-s",
-      "ui_base_unittests",
-      "--blacklist-file",
-      "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--verbose",
-      "--release",
-      "--flakiness-dashboard-server=test-results.appspot.com",
-      "--json-results-file",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "env": {
-      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
-    },
-    "name": "ui_base_unittests.ui_base_unittests (with patch)",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[BUILD]/scripts/slave/tee.py",
-      "/path/to/tmp/logcat",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
-      "[TMP_BASE]/logcat_tmp_14"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "ui_base_unittests.logcat_dump",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "unit_tests"
-  },
-  {
-    "cmd": [
-      "[BUILD]/scripts/slave/daemonizer.py",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
-      "[TMP_BASE]/logcat_tmp_15"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "env": {
-      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
-    },
-    "name": "unit_tests.spawn_logcat_monitor",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/build/android/test_runner.py",
       "gtest",
       "-s",
       "unit_tests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--verbose",
       "--release",
       "--flakiness-dashboard-server=test-results.appspot.com",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "unit_tests.unit_tests (with patch)",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
+    "name": "unit_tests (with patch)"
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "[BUILD]/scripts/slave/tee.py",
-      "/path/to/tmp/logcat",
-      "--",
-      "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
-      "[TMP_BASE]/logcat_tmp_15"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "unit_tests.logcat_dump",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/build/android/test_runner.py",
       "junit",
       "-s",
       "junit_unit_tests",
       "--verbose",
       "--release",
       "--json-results-file",
       "/path/to/tmp/json"
@@ skipping 97 matching lines @@
       "http",
       "--device-type",
       "Android",
       "--remote-device",
       "Nexus 5",
       "--remote-device-os",
       "4.4.2",
       "--collect",
       "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
       "--results-path",
-      "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",
+      "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
       "--verbose",
       "--json-results-file",
       "/path/to/tmp/json",
       "--release"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[collect] android_webview_unittests (with patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@on Foo Fone 1.2.3@@@"
     ]
@@ skipping 46 matching lines @@
       "http",
       "--device-type",
       "Android",
       "--remote-device",
       "Nexus 5",
       "--remote-device-os",
       "4.4.2",
       "--collect",
       "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
       "--results-path",
-      "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",
+      "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
       "--verbose",
       "--json-results-file",
       "/path/to/tmp/json",
       "--release"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[collect] base_unittests (with patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@on Foo Fone 1.2.3@@@"
     ]
@@ skipping 46 matching lines @@
       "http",
       "--device-type",
       "Android",
       "--remote-device",
       "Nexus 5",
       "--remote-device-os",
       "4.4.2",
       "--collect",
       "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
       "--results-path",
-      "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",
+      "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
       "--verbose",
       "--json-results-file",
       "/path/to/tmp/json",
       "--release"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[collect] components_unittests (with patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@on Foo Fone 1.2.3@@@"
     ]
@@ skipping 44 matching lines @@
       "http",
       "--device-type",
       "Android",
       "--remote-device",
       "Nexus 5",
       "--remote-device-os",
       "4.4.2",
       "--collect",
       "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
       "--results-path",
-      "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",
+      "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
       "--verbose",
       "--json-results-file",
       "/path/to/tmp/json",
       "--release"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[collect] events_unittests (with patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@on Foo Fone 1.2.3@@@"
     ]
@@ skipping 44 matching lines @@
       "http",
       "--device-type",
       "Android",
       "--remote-device",
       "Nexus 5",
       "--remote-device-os",
       "4.4.2",
       "--collect",
       "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
       "--results-path",
-      "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",
+      "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
       "--verbose",
       "--json-results-file",
       "/path/to/tmp/json",
       "--release"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[collect] gl_tests (with patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@on Foo Fone 1.2.3@@@"
     ]
@@ skipping 44 matching lines @@
       "http",
       "--device-type",
       "Android",
       "--remote-device",
       "Nexus 5",
       "--remote-device-os",
       "4.4.2",
       "--collect",
       "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
       "--results-path",
-      "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",
+      "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
       "--verbose",
       "--json-results-file",
       "/path/to/tmp/json",
       "--release"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[collect] ipc_tests (with patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@on Foo Fone 1.2.3@@@"
     ]
@@ skipping 46 matching lines @@
       "http",
       "--device-type",
       "Android",
       "--remote-device",
       "Nexus 5",
       "--remote-device-os",
       "4.4.2",
       "--collect",
       "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
       "--results-path",
-      "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",
+      "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
       "--verbose",
       "--json-results-file",
       "/path/to/tmp/json",
       "--release"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[collect] sql_unittests (with patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@on Foo Fone 1.2.3@@@"
     ]
@@ skipping 46 matching lines @@
       "http",
       "--device-type",
       "Android",
       "--remote-device",
       "Nexus 5",
       "--remote-device-os",
       "4.4.2",
       "--collect",
       "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
       "--results-path",
-      "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",
+      "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
       "--verbose",
       "--json-results-file",
       "/path/to/tmp/json",
       "--release"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[collect] sync_unit_tests (with patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@on Foo Fone 1.2.3@@@"
     ]
@@ skipping 44 matching lines @@
       "http",
       "--device-type",
       "Android",
       "--remote-device",
       "Nexus 5",
       "--remote-device-os",
       "4.4.2",
       "--collect",
       "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
       "--results-path",
-      "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",
+      "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
       "--verbose",
       "--json-results-file",
       "/path/to/tmp/json",
       "--release"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[collect] ui_android_unittests (with patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@on Foo Fone 1.2.3@@@"
     ]
@@ skipping 44 matching lines @@
       "http",
       "--device-type",
       "Android",
       "--remote-device",
       "Nexus 5",
       "--remote-device-os",
       "4.4.2",
       "--collect",
       "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
       "--results-path",
-      "[TMP_BASE]/amp_results_tmp_16/T35TRUN1D/results.zip",
+      "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
       "--verbose",
       "--json-results-file",
       "/path/to/tmp/json",
       "--release"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[collect] ui_touch_selection_unittests (with patch)",
     "~followup_annotations": [
-      "@@@STEP_TEXT@on Foo Fone 1.2.3@@@",
-      "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "import sys; sys.exit(1)"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "AndroidWebViewTest (2)",
-    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
-      "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
-      "@@@STEP_FAILURE@@@",
-      "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "import sys; sys.exit(1)"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "ContentShellTest (2)",
-    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
-      "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
-      "@@@STEP_FAILURE@@@",
-      "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "import sys; sys.exit(1)"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "ChromePublicTest (2)",
-    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
-      "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
-      "@@@STEP_FAILURE@@@",
-      "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "import sys; sys.exit(1)"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "ChromeSyncShellTest (2)",
-    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
-      "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
-      "@@@STEP_FAILURE@@@",
-      "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "import sys; sys.exit(1)"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "breakpad_unittests (2)",
-    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
-      "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
-      "@@@STEP_FAILURE@@@",
-      "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "import sys; sys.exit(1)"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "cc_unittests (2)",
-    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
-      "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
-      "@@@STEP_FAILURE@@@",
-      "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "import sys; sys.exit(1)"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "content_browsertests (2)",
-    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
-      "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
-      "@@@STEP_FAILURE@@@",
-      "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "import sys; sys.exit(1)"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "content_unittests (2)",
-    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
-      "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
-      "@@@STEP_FAILURE@@@",
-      "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "import sys; sys.exit(1)"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "gpu_unittests (2)",
-    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
-      "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
-      "@@@STEP_FAILURE@@@",
-      "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "import sys; sys.exit(1)"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "media_unittests (2)",
-    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
-      "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
-      "@@@STEP_FAILURE@@@",
-      "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "import sys; sys.exit(1)"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "net_unittests (2)",
-    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
-      "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
-      "@@@STEP_FAILURE@@@",
-      "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "import sys; sys.exit(1)"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "sandbox_linux_unittests (2)",
-    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
-      "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
-      "@@@STEP_FAILURE@@@",
-      "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "import sys; sys.exit(1)"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "ui_base_unittests (2)",
-    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
-      "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
-      "@@@STEP_FAILURE@@@",
-      "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "import sys; sys.exit(1)"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "unit_tests (2)",
-    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
-      "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
-      "@@@STEP_FAILURE@@@"
-    ]
-  },
-  {
+      "@@@STEP_TEXT@on Foo Fone 1.2.3@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[BUILD]/scripts/slave/bot_update.py",
+      "--master",
+      "tryserver.chromium.linux",
+      "--builder",
+      "android_amp",
+      "--slave",
+      "TestSlavename",
+      "--spec",
+      "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']",
+      "--root",
+      "src",
+      "--revision_mapping_file",
+      "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
+      "--rietveld_server",
+      "https://codereview.chromium.org",
+      "--output_json",
+      "/path/to/tmp/json",
+      "--revision",
+      "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
+      "--force",
+      "--output_manifest"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "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@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src/native_client\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src/native_client.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src/third_party/angle\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src/third_party/webrtc\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src/tools/swarming_client\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src/v8\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src/v8.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"root\": \"src\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"step_text\": \"Some step text\"@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[DEPOT_TOOLS]/gclient.py",
+      "runhooks"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "GYP_CROSSCOMPILE": "1",
+      "GYP_DEFINES": "OS=android component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1",
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+    },
+    "name": "gclient runhooks (without patch)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[BUILD]/scripts/slave/compile.py",
+      "--target",
+      "Release",
+      "--src-dir",
+      "[SLAVE_BUILD]/src",
+      "--build-tool",
+      "ninja",
+      "--compiler",
+      "goma",
+      "--goma-jsonstatus",
+      "/path/to/tmp/json",
+      "--goma-dir",
+      "[BUILD]/goma",
+      "--goma-fail-fast",
+      "--goma-disable-local-fallback",
+      "--",
+      "android_webview_test_apk",
+      "chrome_junit_tests",
+      "chrome_public_test_apk",
+      "chrome_sync_shell_test_apk",
+      "content_junit_tests",
+      "content_shell_test_apk",
+      "junit_unit_tests"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/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": [
+      "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
+      "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebView.apk",
+      "-v",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--release"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+    },
+    "name": "install AndroidWebView.apk (2)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "instrumentation",
+      "--test-apk",
+      "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebViewTest.apk",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--apk-under-test",
+      "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebView.apk",
+      "--isolate-file-path",
+      "android_webview/android_webview_test_apk.isolate",
+      "--flakiness-dashboard-server",
+      "test-results.appspot.com",
+      "--verbose",
+      "--release",
+      "--json-results-file",
+      "/path/to/tmp/json"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "Instrumentation test AndroidWebViewTest (without patch)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
+      "[SLAVE_BUILD]/src/out/Release/apks/ContentShell.apk",
+      "-v",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--release"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+    },
+    "name": "install ContentShell.apk (2)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "instrumentation",
+      "--test-apk",
+      "[SLAVE_BUILD]/src/out/Release/apks/ContentShellTest.apk",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--apk-under-test",
+      "[SLAVE_BUILD]/src/out/Release/apks/ContentShell.apk",
+      "--isolate-file-path",
+      "content/content_shell_test_apk.isolate",
+      "--flakiness-dashboard-server",
+      "test-results.appspot.com",
+      "--verbose",
+      "--release",
+      "--json-results-file",
+      "/path/to/tmp/json"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "Instrumentation test ContentShellTest (without patch)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
+      "[SLAVE_BUILD]/src/out/Release/apks/ChromePublic.apk",
+      "-v",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--release"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+    },
+    "name": "install ChromePublic.apk (2)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "instrumentation",
+      "--test-apk",
+      "[SLAVE_BUILD]/src/out/Release/apks/ChromePublicTest.apk",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--apk-under-test",
+      "[SLAVE_BUILD]/src/out/Release/apks/ChromePublic.apk",
+      "--isolate-file-path",
+      "chrome/chrome_public_test_apk.isolate",
+      "--flakiness-dashboard-server",
+      "test-results.appspot.com",
+      "--verbose",
+      "--release",
+      "--json-results-file",
+      "/path/to/tmp/json"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "Instrumentation test ChromePublicTest (without patch)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
+      "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShell.apk",
+      "-v",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--release"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+    },
+    "name": "install ChromeSyncShell.apk (2)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "instrumentation",
+      "--test-apk",
+      "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShellTest.apk",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--apk-under-test",
+      "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShell.apk",
+      "--flakiness-dashboard-server",
+      "test-results.appspot.com",
+      "--verbose",
+      "--release",
+      "--json-results-file",
+      "/path/to/tmp/json"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "Instrumentation test ChromeSyncShellTest (without patch)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "junit",
+      "-s",
+      "junit_unit_tests",
+      "--verbose",
+      "--release",
+      "--json-results-file",
+      "/path/to/tmp/json"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+    },
+    "name": "junit_unit_tests (without patch)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "junit",
+      "-s",
+      "chrome_junit_tests",
+      "--verbose",
+      "--release",
+      "--json-results-file",
+      "/path/to/tmp/json"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+    },
+    "name": "chrome_junit_tests (without patch)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "junit",
+      "-s",
+      "content_junit_tests",
+      "--verbose",
+      "--release",
+      "--json-results-file",
+      "/path/to/tmp/json"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+    },
+    "name": "content_junit_tests (without patch)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "import sys; sys.exit(0)"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "AndroidWebViewTest (retry summary)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",
+      "@@@STEP_WARNINGS@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "import sys; sys.exit(0)"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "ContentShellTest (retry summary)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",
+      "@@@STEP_WARNINGS@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "import sys; sys.exit(0)"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "ChromePublicTest (retry summary)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",
+      "@@@STEP_WARNINGS@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "import sys; sys.exit(0)"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "ChromeSyncShellTest (retry summary)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",
+      "@@@STEP_WARNINGS@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "import sys; sys.exit(0)"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "junit_unit_tests (retry summary)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",
+      "@@@STEP_WARNINGS@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "import sys; sys.exit(0)"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "chrome_junit_tests (retry summary)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",
+      "@@@STEP_WARNINGS@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "import sys; sys.exit(0)"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "content_junit_tests (retry summary)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@<br/>ignored:<br/>TestB<br/>@@@",
+      "@@@STEP_WARNINGS@@@"
+    ]
+  },
+  {
     "cmd": [
       "python",
       "-u",
       "[BUILD]/scripts/slave/daemonizer.py",
       "--action",
       "stop",
       "--pid-file-path",
       "/tmp/device_monitor.pid"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "shutdown_device_monitor"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
       "--output-path",
       "[SLAVE_BUILD]/src/out/Release/full_log",
-      "[SLAVE_BUILD]/src/out/logcat_dir"
+      "[SLAVE_BUILD]/src/out/logcat"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "logcat_dump"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[gsutil]/resources/gsutil_wrapper.py",
       "--timeout",
@@ skipping 52 matching lines @@
     "cwd": "[SLAVE_BUILD]",
     "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@@@",
-      "@@@SET_BUILD_PROPERTY@failure_hash@\"4cb66b8ac8f4b7da35c560e5b2672272beb9d841\"@@@"
+      "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "name": "$result",
-    "reason": "14 out of 14 aggregated steps failed. Failures: Step('AndroidWebViewTest (2)') failed with return_code 1, Step('ContentShellTest (2)') failed with return_code 1, Step('ChromePublicTest (2)') failed with return_code 1, Step('ChromeSyncShellTest (2)') failed with return_code 1, Step('breakpad_unittests (2)') failed with return_code 1, Step('cc_unittests (2)') failed with return_code 1, Step('content_browsertests (2)') failed with return_code 1, Step('content_unittests (2)') failed with return_code 1, Step('gpu_unittests (2)') failed with return_code 1, Step('media_unittests (2)') failed with return_code 1, Step('net_unittests (2)') failed with return_code 1, Step('sandbox_linux_unittests (2)') failed with return_code 1, Step('ui_base_unittests (2)') failed with return_code 1, Step('unit_tests (2)') failed with return_code 1",
-    "status_code": 1
+    "recipe_result": null,
+    "status_code": 0
   }
 ]