Revert of Src-ify Android Tests.

testing/buildbot/chromium.linux.json

Index: testing/buildbot/chromium.linux.json
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index 879a8af5f6beea6dbc8884911bbff84157d79b68..b019fa5fd14422548341364ab3c60d3c582a3fd4 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -138,119 +138,6 @@
     ]
   },
   "Android Tests": {
-    "gtest_tests": [
-      {
-        "test": "android_webview_unittests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/base/base_unittests.isolate"
-        ],
-        "test": "base_unittests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/breakpad/breakpad_unittests.isolate"
-        ],
-        "override_compile_targets": [
-          "breakpad_unittests_deps"
-        ],
-        "test": "breakpad_unittests"
-      },
-      {
-        "test": "cc_unittests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/components/components_browsertests.isolate"
-        ],
-        "test": "components_browsertests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/components/components_unittests.isolate"
-        ],
-        "test": "components_unittests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/content/content_browsertests.isolate"
-        ],
-        "test": "content_browsertests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/content/content_unittests.isolate"
-        ],
-        "test": "content_unittests"
-      },
-      {
-        "test": "device_unittests"
-      },
-      {
-        "test": "events_unittests"
-      },
-      {
-        "test": "gl_tests"
-      },
-      {
-        "test": "gl_unittests"
-      },
-      {
-        "test": "gpu_unittests"
-      },
-      {
-        "test": "ipc_tests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/media/media_unittests.isolate"
-        ],
-        "test": "media_unittests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/net/net_unittests.isolate"
-        ],
-        "test": "net_unittests"
-      },
-      {
-        "override_compile_targets": [
-          "sandbox_linux_unittests_deps"
-        ],
-        "test": "sandbox_linux_unittests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/sql/sql_unittests.isolate"
-        ],
-        "test": "sql_unittests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/sync/sync_unit_tests.isolate"
-        ],
-        "test": "sync_unit_tests"
-      },
-      {
-        "test": "ui_android_unittests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/ui/base/ui_base_tests.isolate"
-        ],
-        "test": "ui_base_unittests"
-      },
-      {
-        "test": "ui_touch_selection_unittests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/chrome/unit_tests.isolate"
-        ],
-        "test": "unit_tests"
-      }
-    ],
     "scripts": [
       {
         "name": "webview_licenses",
@@ -270,119 +157,6 @@
     ]
   },
   "Android Tests (dbg)": {
-    "gtest_tests": [
-      {
-        "test": "android_webview_unittests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/base/base_unittests.isolate"
-        ],
-        "test": "base_unittests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/breakpad/breakpad_unittests.isolate"
-        ],
-        "override_compile_targets": [
-          "breakpad_unittests_deps"
-        ],
-        "test": "breakpad_unittests"
-      },
-      {
-        "test": "cc_unittests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/components/components_browsertests.isolate"
-        ],
-        "test": "components_browsertests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/components/components_unittests.isolate"
-        ],
-        "test": "components_unittests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/content/content_browsertests.isolate"
-        ],
-        "test": "content_browsertests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/content/content_unittests.isolate"
-        ],
-        "test": "content_unittests"
-      },
-      {
-        "test": "device_unittests"
-      },
-      {
-        "test": "events_unittests"
-      },
-      {
-        "test": "gl_tests"
-      },
-      {
-        "test": "gl_unittests"
-      },
-      {
-        "test": "gpu_unittests"
-      },
-      {
-        "test": "ipc_tests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/media/media_unittests.isolate"
-        ],
-        "test": "media_unittests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/net/net_unittests.isolate"
-        ],
-        "test": "net_unittests"
-      },
-      {
-        "override_compile_targets": [
-          "sandbox_linux_unittests_deps"
-        ],
-        "test": "sandbox_linux_unittests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/sql/sql_unittests.isolate"
-        ],
-        "test": "sql_unittests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/sync/sync_unit_tests.isolate"
-        ],
-        "test": "sync_unit_tests"
-      },
-      {
-        "test": "ui_android_unittests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/ui/base/ui_base_tests.isolate"
-        ],
-        "test": "ui_base_unittests"
-      },
-      {
-        "test": "ui_touch_selection_unittests"
-      },
-      {
-        "args": [
-          "--isolate_file_path=src/chrome/unit_tests.isolate"
-        ],
-        "test": "unit_tests"
-      }
-    ],
     "scripts": [
       {
         "name": "webview_licenses",