[android bisect] use devil's version of adb in bisect.

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

Index: scripts/slave/recipes/bisection/android_bisect.expected/perf_cq_no_benchmark_to_run_android_webview_nexus6_aosp_perf_bisect.json
diff --git a/scripts/slave/recipes/bisection/android_bisect.expected/perf_cq_no_benchmark_to_run_android_webview_nexus6_aosp_perf_bisect.json b/scripts/slave/recipes/bisection/android_bisect.expected/perf_cq_no_benchmark_to_run_android_webview_nexus6_aosp_perf_bisect.json
index 095d4de0a53beab3fc1a79f70574e15510e1be48..71b2af82bdb3df37fec5dfd2caa423c526572b14 100644
--- a/scripts/slave/recipes/bisection/android_bisect.expected/perf_cq_no_benchmark_to_run_android_webview_nexus6_aosp_perf_bisect.json
+++ b/scripts/slave/recipes/bisection/android_bisect.expected/perf_cq_no_benchmark_to_run_android_webview_nexus6_aosp_perf_bisect.json
@@ -213,6 +213,24 @@
   },
   {
     "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_webview_nexus6_aosp_perf_bisect/src/third_party/catapult/devil"
+    ],
+    "name": "initialize devil",
+    "~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": [
       "git",
       "diff",
       "--cached",
@@ -232,7 +250,7 @@
       "-u",
       "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/build/symlink.py",
       "-f",
-      "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb",
+      "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
       "~/adb"
     ],
     "cwd": "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect",
@@ -244,7 +262,7 @@
       "--",
       "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/build/android/adb_logcat_monitor.py",
       "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/out/logcat",
-      "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb"
+      "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
     ],
     "cwd": "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect",
     "env": {
@@ -265,7 +283,7 @@
       "--",
       "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/third_party/catapult/devil/devil/android/tools/device_monitor.py",
       "--adb-path",
-      "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb",
+      "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/out/bad_devices.json"
     ],
@@ -279,7 +297,7 @@
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",
       "--verbose",
       "--adb-path",
-      "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb"
+      "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
     ],
     "cwd": "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect",
     "env": {
@@ -296,7 +314,7 @@
       "--known-devices-file",
       "[HOME]/.android/known_devices.json",
       "--adb-path",
-      "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb",
+      "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
       "-v",
       "--enable-usb-reset"
     ],
@@ -313,7 +331,7 @@
       "-u",
       "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/build/android/provision_devices.py",
       "--adb-path",
-      "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb",
+      "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/out/bad_devices.json",
       "--output-device-blacklist",
@@ -347,7 +365,7 @@
       "--buildbot-path",
       "/home/chrome-bot/.adb_device_info",
       "--adb-path",
-      "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb",
+      "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
       "-v",
       "--overwrite-known-devices-files"
     ],
@@ -652,7 +670,7 @@
       "--blacklist-file",
       "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/out/bad_devices.json",
       "--adb-path",
-      "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb",
+      "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
       "--release"
     ],
     "cwd": "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect",