[Android] Switch CQ + main waterfall to gn.

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 a4d6a2c342f051b5cc2e82a565260b918e842d3a..d6391f96d47ef6d0e1dc01c04a948e5ccf360b8e 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -1,7 +1,7 @@
 {
   "Android Arm64 Builder (dbg)": {
     "additional_compile_targets": [
-      "android_builder_tests"
+      "gn_all"
     ]
   },
   "Android Builder": {
@@ -17,7 +17,7 @@
   },
   "Android Clang Builder (dbg)": {
     "additional_compile_targets": [
-      "android_builder_tests"
+      "gn_all"
     ]
   },
   "Android GN": {
@@ -148,6 +148,9 @@
         "test": "components_policy_junit_tests"
       },
       {
+        "test": "components_web_restrictions_junit_tests"
+      },
+      {
         "test": "content_junit_tests"
       },
       {
@@ -187,6 +190,10 @@
         "test": "cc_unittests"
       },
       {
+        "override_compile_targets": [
+          "chrome_public_test_apk"
+        ],
+        "override_isolate_target": "chrome_public_test_apk",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -197,7 +204,7 @@
           ],
           "hard_timeout": 1200
         },
-        "test": "chrome_public_test"
+        "test": "chrome_public_test_apk"
       },
       {
         "test": "components_browsertests"
@@ -206,6 +213,7 @@
         "test": "components_unittests"
       },
       {
+        "override_isolate_target": "content_browsertests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -289,7 +297,13 @@
         "test": "chrome_junit_tests"
       },
       {
-        "test": "components_junit_tests"
+        "test": "components_invalidation_impl_junit_tests"
+      },
+      {
+        "test": "components_policy_junit_tests"
+      },
+      {
+        "test": "components_web_restrictions_junit_tests"
       },
       {
         "test": "content_junit_tests"
@@ -418,7 +432,13 @@
         "test": "chrome_junit_tests"
       },
       {
-        "test": "components_junit_tests"
+        "test": "components_invalidation_impl_junit_tests"
+      },
+      {
+        "test": "components_policy_junit_tests"
+      },
+      {
+        "test": "components_web_restrictions_junit_tests"
       },
       {
         "test": "content_junit_tests"