Use devil's adb with each bisect iteration, also start/stop daemons.

scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_nexus5_perf_bisect.json

Index: scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_nexus5_perf_bisect.json
diff --git a/scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_nexus5_perf_bisect.json b/scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_nexus5_perf_bisect.json
index 8b23cffda6ffc76b6c96ab864f1dd440d47a3466..5c780ab69e8a97c4f8840ba510bde05d6c1f4052 100644
--- a/scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_nexus5_perf_bisect.json
+++ b/scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_nexus5_perf_bisect.json
@@ -571,6 +571,64 @@
     "cmd": [
       "python",
       "-u",
+      "\nimport sys\nsys.path.append(sys.argv[1])\nfrom devil import devil_env\ndevil_env.config.Initialize()\ndevil_env.config.PrefetchPaths(dependencies=['adb'])\n",
+      "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/catapult/devil"
+    ],
+    "env": {
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
+    },
+    "name": "initialize devil (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@sys.path.append(sys.argv[1])@@@",
+      "@@@STEP_LOG_LINE@python.inline@from devil import devil_env@@@",
+      "@@@STEP_LOG_LINE@python.inline@devil_env.config.Initialize()@@@",
+      "@@@STEP_LOG_LINE@python.inline@devil_env.config.PrefetchPaths(dependencies=['adb'])@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
+      "--",
+      "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android/adb_logcat_monitor.py",
+      "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/logcat",
+      "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
+    ],
+    "env": {
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
+    },
+    "name": "spawn_logcat_monitor (2)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
+      "--action",
+      "restart",
+      "--pid-file-path",
+      "/tmp/device_monitor.pid",
+      "--",
+      "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/catapult/devil/devil/android/tools/device_monitor.py",
+      "--adb-path",
+      "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
+      "--blacklist-file",
+      "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/bad_devices.json"
+    ],
+    "env": {
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
+    },
+    "name": "spawn_device_monitor (2)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/chrome/VERSION",
       "/path/to/tmp/"
@@ -707,6 +765,107 @@
     "cmd": [
       "python",
       "-u",
+      "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
+      "--action",
+      "stop",
+      "--pid-file-path",
+      "/tmp/device_monitor.pid"
+    ],
+    "env": {
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
+    },
+    "name": "shutdown_device_monitor"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android/adb_logcat_printer.py",
+      "--output-path",
+      "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/Release/full_log",
+      "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/logcat"
+    ],
+    "env": {
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/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_nexus5_perf_bisect/src/out/Release/full_log",
+      "gs://chromium-android/logcat_dumps/android_nexus5_perf_bisect/571"
+    ],
+    "env": {
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
+    },
+    "name": "gsutil upload (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/android_nexus5_perf_bisect/571@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_platform/development/scripts/stack",
+      "--arch",
+      "arm",
+      "--more-info",
+      "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/Release/full_log"
+    ],
+    "env": {
+      "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/Release",
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/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_nexus5_perf_bisect/src/chrome/VERSION",
+      "/path/to/tmp/"
+    ],
+    "env": {
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
+    },
+    "name": "get version (2)"
+  },
+  {
+    "cmd": [
+      "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android/tombstones.py",
+      "-a",
+      "-s",
+      "-w"
+    ],
+    "env": {
+      "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/Release",
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/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_nexus5_perf_bisect/src/out/Release/test_logs/*.log"
     ],
@@ -842,7 +1001,7 @@
       "/tmp/device_monitor.pid"
     ],
     "cwd": "[BUILDER_CACHE]/android_nexus5_perf_bisect",
-    "name": "shutdown_device_monitor"
+    "name": "shutdown_device_monitor (2)"
   },
   {
     "cmd": [
@@ -854,7 +1013,7 @@
       "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/logcat"
     ],
     "cwd": "[BUILDER_CACHE]/android_nexus5_perf_bisect",
-    "name": "logcat_dump"
+    "name": "logcat_dump (2)"
   },
   {
     "cmd": [
@@ -875,7 +1034,7 @@
       "gs://chromium-android/logcat_dumps/android_nexus5_perf_bisect/571"
     ],
     "cwd": "[BUILDER_CACHE]/android_nexus5_perf_bisect",
-    "name": "gsutil upload (2)",
+    "name": "gsutil upload (3)",
     "~followup_annotations": [
       "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/android_nexus5_perf_bisect/571@@@"
     ]
@@ -894,7 +1053,7 @@
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
     },
-    "name": "stack_tool_with_logcat_dump"
+    "name": "stack_tool_with_logcat_dump (2)"
   },
   {
     "cmd": [
@@ -905,7 +1064,7 @@
       "/path/to/tmp/"
     ],
     "cwd": "[BUILDER_CACHE]/android_nexus5_perf_bisect",
-    "name": "get version (2)"
+    "name": "get version (3)"
   },
   {
     "cmd": [
@@ -920,7 +1079,7 @@
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
     },
-    "name": "stack_tool_for_tombstones"
+    "name": "stack_tool_for_tombstones (2)"
   },
   {
     "cmd": [