[Android] Revise devil environment handling of host dependencies.

build/android/devil/devil_dependencies.json

Index: build/android/devil/devil_dependencies.json
diff --git a/build/android/devil/devil_dependencies.json b/build/android/devil/devil_dependencies.json
index 58c099d671163e60a832c549688977fdda51b85e..31db2270dbeb8fb711238a8a345a0260dfb75f1f 100644
--- a/build/android/devil/devil_dependencies.json
+++ b/build/android/devil/devil_dependencies.json
@@ -5,7 +5,7 @@
       "cloud_storage_bucket": "chromium-telemetry",
       "cloud_storage_base_folder": "binary_dependencies",
       "file_info": {
-        "android_linux2": {
+        "linux_x86_64": {
           "cloud_storage_hash": "7448de3cb5e834afdedeaad8b40ba63ac53f3dc4",
           "download_path": "../bin/aapt"
         }
@@ -15,7 +15,7 @@
       "cloud_storage_bucket": "chromium-telemetry",
       "cloud_storage_base_folder": "binary_dependencies",
       "file_info": {
-        "android_linux2": {
+        "linux_x86_64": {
           "cloud_storage_hash": "0c2043552619c8ec8bb5d986ba75703a598611fc",
           "download_path": "../bin/adb"
         }
@@ -25,7 +25,7 @@
       "cloud_storage_bucket": "chromium-telemetry",
       "cloud_storage_base_folder": "binary_dependencies",
       "file_info": {
-        "android_linux2": {
+        "linux_x86_64": {
           "cloud_storage_hash": "52d150a7ccde835f38b4337392152f3013d5f303",
           "download_path": "../bin/lib/libc++.so"
         }
@@ -35,7 +35,7 @@
       "cloud_storage_bucket": "chromium-telemetry",
       "cloud_storage_base_folder": "binary_dependencies",
       "file_info": {
-        "android_linux2": {
+        "linux_x86_64": {
           "cloud_storage_hash": "049f482f29bc34e2ed844e2e47b7609f8ffbeb4f",
           "download_path": "../bin/lib.java/chromium_commands.dex.jar"
         }
@@ -45,7 +45,7 @@
       "cloud_storage_bucket": "chromium-telemetry",
       "cloud_storage_base_folder": "binary_dependencies",
       "file_info": {
-        "android_linux2": {
+        "linux_x86_64": {
           "cloud_storage_hash": "38765b5b358c29003e56b1d214606ea13467b6fe",
           "download_path": "../bin/dexdump"
         }
@@ -69,7 +69,7 @@
       "cloud_storage_bucket": "chromium-telemetry",
       "cloud_storage_base_folder": "binary_dependencies",
       "file_info": {
-        "android_linux2": {
+        "linux_x86_64": {
           "cloud_storage_hash": "b3dda9fbdd4a3fb933b64111c11070aa809c7ed4",
           "download_path": "../bin/forwarder_host"
         }
@@ -97,7 +97,7 @@
       "cloud_storage_bucket": "chromium-telemetry",
       "cloud_storage_base_folder": "binary_dependencies",
       "file_info": {
-        "android_linux2": {
+        "linux_x86_64": {
           "cloud_storage_hash": "49e36c9c4246cfebef26cbd07436c1a8343254aa",
           "download_path": "../bin/md5sum_host"
         }
@@ -105,17 +105,22 @@
     },
     "pymock": {
       "file_info": {
-        "android_darwin": {
+        "linux_x86_64": {
           "local_paths": [
             "../../../tools/telemetry/third_party/mock"
           ]
         },
-        "android_linux2": {
+        "mac_x86_64": {
           "local_paths": [
             "../../../tools/telemetry/third_party/mock"
           ]
         },
-        "android_win32": {
+        "win_AMD64": {
+          "local_paths": [
+            "../../../tools/telemetry/third_party/mock"
+          ]
+        },
+        "win_x86": {
           "local_paths": [
             "../../../tools/telemetry/third_party/mock"
           ]
@@ -126,7 +131,7 @@
       "cloud_storage_bucket": "chromium-telemetry",
       "cloud_storage_base_folder": "binary_dependencies",
       "file_info": {
-        "android_linux2": {
+        "linux_x86_64": {
           "cloud_storage_hash": "3327881fa3951a503b9467425ea8e781cdffeb9f",
           "download_path": "../bin/split-select"
         }