Make perf android tests use devil adb

scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Galaxy_S5_Perf__2_.json

Index: scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Galaxy_S5_Perf__2_.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Galaxy_S5_Perf__2_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Galaxy_S5_Perf__2_.json
index a3be43db0c6185dfd6f5c79758d6077fb6216e72..47b0cac335cc9a072d81e9f5cbfa8ce77751d146 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Galaxy_S5_Perf__2_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Galaxy_S5_Perf__2_.json
@@ -556,6 +556,29 @@
     "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_Galaxy_S5_Perf__2_/src/third_party/catapult/devil"
+    ],
+    "cwd": "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__2_",
+    "env": {
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__2_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Galaxy_S5_Perf__2_/src/build/android:%(PATH)s"
+    },
+    "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": [
+      "python",
+      "-u",
       "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__2_/src/tools/perf/run_benchmark",
       "list",
       "--browser",
@@ -565,7 +588,9 @@
       "--num-shards",
       "21",
       "--device",
-      "07a00ca4"
+      "07a00ca4",
+      "--adb-path",
+      "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__2_/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
     ],
     "cwd": "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__2_",
     "env": {
@@ -626,7 +651,7 @@
       "--known-devices-file",
       "[HOME]/.android/known_devices.json",
       "--adb-path",
-      "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__2_/src/third_party/android_tools/sdk/platform-tools/adb"
+      "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__2_/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
     ],
     "cwd": "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__2_/src",
     "env": {
@@ -649,7 +674,7 @@
       "--blacklist-file",
       "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__2_/src/out/bad_devices.json",
       "--adb-path",
-      "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__2_/src/third_party/android_tools/sdk/platform-tools/adb"
+      "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__2_/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
     ],
     "cwd": "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__2_",
     "env": {
@@ -707,7 +732,7 @@
       "page_cycler.foo",
       "--verbose",
       "--adb-path",
-      "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__2_/src/third_party/android_tools/sdk/platform-tools/adb",
+      "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__2_/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
       "--blacklist-file",
       "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__2_/src/out/bad_devices.json"
     ],
@@ -759,7 +784,7 @@
       "perf_test.foo",
       "--verbose",
       "--adb-path",
-      "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__2_/src/third_party/android_tools/sdk/platform-tools/adb",
+      "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__2_/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
       "--blacklist-file",
       "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__2_/src/out/bad_devices.json"
     ],