Enable new device monitor everywhere and launch it earlier in the build.

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

Index: scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus7v2_Perf__2_.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus7v2_Perf__2_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus7v2_Perf__2_.json
index 1251f195f21de7fec3c19e1db758b83774633b34..b019fc332b0e91f571750db083b19dd82d3ea5c4 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus7v2_Perf__2_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Nexus7v2_Perf__2_.json
@@ -355,6 +355,29 @@
     "cmd": [
       "python",
       "-u",
+      "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
+      "--action",
+      "restart",
+      "--pid-file-path",
+      "/tmp/device_monitor.pid",
+      "--",
+      "[BUILDER_CACHE]/Android_Nexus7v2_Perf__2_/src/third_party/catapult/devil/devil/android/tools/device_monitor.py",
+      "--adb-path",
+      "[BUILDER_CACHE]/Android_Nexus7v2_Perf__2_/src/third_party/android_tools/sdk/platform-tools/adb",
+      "--blacklist-file",
+      "[BUILDER_CACHE]/Android_Nexus7v2_Perf__2_/src/out/bad_devices.json"
+    ],
+    "cwd": "[BUILDER_CACHE]/Android_Nexus7v2_Perf__2_",
+    "env": {
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[BUILDER_CACHE]/Android_Nexus7v2_Perf__2_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Nexus7v2_Perf__2_/src/build/android:%(PATH)s"
+    },
+    "name": "spawn_device_monitor"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",
       "--verbose",
       "--adb-path",
@@ -534,29 +557,6 @@
     "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_Nexus7v2_Perf__2_/src/third_party/android_tools/sdk/platform-tools/adb",
-      "[\"07a00ca4\"]",
-      "--blacklist-file",
-      "[BUILDER_CACHE]/Android_Nexus7v2_Perf__2_/src/out/bad_devices.json"
-    ],
-    "cwd": "[BUILDER_CACHE]/Android_Nexus7v2_Perf__2_",
-    "env": {
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/Android_Nexus7v2_Perf__2_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Nexus7v2_Perf__2_/src/build/android:%(PATH)s"
-    },
-    "name": "spawn_device_monitor"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
       "[BUILDER_CACHE]/Android_Nexus7v2_Perf__2_/src/tools/perf/run_benchmark",
       "list",
       "--browser",