[Android] Switch CQ + main waterfall to gn.

tools/mb/mb_config.pyl

Index: tools/mb/mb_config.pyl
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index feda59d73bedc25edb915e85896ea8c07a6bf36c..b4efc8cf09d716298a41ba9220f77914105da8b8 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -12,7 +12,7 @@
     # generated publicly advertised non-Official builds which are not allowed
     # to have proprietary codecs enabled.
     'chromium': {
-      'Android': 'android_without_codecs_gyp_release_bot_minimal_symbols',
+      'Android': 'android_without_codecs_gn_release_bot_minimal_symbols',
       'Linux x64': 'noswarming_gn_release_bot',
       'Mac': 'noswarming_gyp_release_bot_mac_strip',
       'Win': 'noswarming_gyp_release_bot_minimal_symbols_x86',
@@ -290,15 +290,15 @@
 
     'chromium.linux': {
       'Android Arm64 Builder (dbg)':
-        'swarming_android_gyp_debug_static_bot_arm64',
-      'Android Builder (dbg)': 'swarming_android_gyp_debug_static_bot',
-      'Android Builder': 'swarming_android_gyp_release_bot_minimal_symbols',
+        'swarming_android_gn_debug_static_bot_arm64',
+      'Android Builder (dbg)': 'swarming_android_gn_debug_static_bot',
+      'Android Builder': 'swarming_android_gn_release_bot_minimal_symbols',
       'Android Clang Builder (dbg)':
-        'android_clang_asan_findbugs_gyp_debug_bot_minimal_symbols',
+        'android_clang_asan_findbugs_gn_debug_bot_minimal_symbols',
       'Android GN (dbg)': 'android_gn_debug_bot_minimal_symbols',
       'Android GN': 'android_gn_release_bot_minimal_symbols',
-      'Android Tests (dbg)': 'swarming_android_gyp_debug_static_bot',
-      'Android Tests': 'swarming_android_gyp_release_bot_minimal_symbols',
+      'Android Tests (dbg)': 'swarming_android_gn_debug_static_bot',
+      'Android Tests': 'swarming_android_gn_release_bot_minimal_symbols',
       'Cast Android (dbg)': 'android_cast_gn_debug_static_bot',
       'Cast Linux': 'cast_gn_release_bot',
       'Linux Builder (dbg)': 'swarming_gn_debug_bot',
@@ -644,8 +644,8 @@
 
     'tryserver.chromium.android': {
       'android_archive_rel_ng': 'android_gn_release_trybot',
-      'android_arm64_dbg_recipe': 'swarming_android_gyp_debug_trybot_arm64',
-      'android_blink_rel': 'swarming_android_gyp_release_trybot',
+      'android_arm64_dbg_recipe': 'swarming_android_gn_debug_trybot_arm64',
+      'android_blink_rel': 'swarming_android_gn_release_trybot',
       'android_chromium_gn_compile_dbg': 'android_gn_debug_trybot',
       'android_chromium_gn_compile_rel': 'android_gn_release_trybot',
       'android_chromium_gn_rel': 'android_gn_release_trybot',
@@ -656,10 +656,10 @@
       'android_chromium_variable_clang': 'findit',
       'android_chromium_variable_gn': 'findit',
       'android_chromium_variable_nexus4': 'findit',
-      'android_clang_dbg_recipe': 'android_clang_asan_findbugs_gyp_debug_trybot',
-      'android_compile_dbg': 'swarming_android_gyp_debug_trybot',
+      'android_clang_dbg_recipe': 'android_clang_asan_findbugs_gn_debug_trybot',
+      'android_compile_dbg': 'swarming_android_gn_debug_trybot',
       'android_compile_mips_dbg': 'android_gn_debug_trybot_mipsel',
-      'android_compile_rel': 'swarming_android_gyp_release_trybot',
+      'android_compile_rel': 'swarming_android_gn_release_trybot',
       'android_compile_x64_dbg': 'android_gn_debug_trybot_x64',
       'android_compile_x86_dbg': 'android_gn_debug_trybot_x86',
       'android_coverage': 'android_gn_debug_trybot_java_coverage',
@@ -668,8 +668,8 @@
       'android_cronet_tester': 'android_cronet_gn_debug_static_bot',
       'android_swarming_rel': 'swarming_android_gn_release_trybot',
       'cast_shell_android': 'android_cast_gn_debug_static_bot',
-      'linux_android_dbg_ng': 'swarming_android_gyp_debug_trybot',
-      'linux_android_rel_ng': 'swarming_android_gyp_release_trybot',
+      'linux_android_dbg_ng': 'swarming_android_gn_debug_trybot',
+      'linux_android_rel_ng': 'swarming_android_gn_release_trybot',
     },
 
     'tryserver.chromium.angle': {
@@ -909,13 +909,13 @@
       'shared', 'debug', 'minimal_symbols',
     ],
 
-    'android_clang_asan_findbugs_gyp_debug_bot_minimal_symbols': [
-      'android', 'clang', 'asan', 'findbugs', 'gyp',
+    'android_clang_asan_findbugs_gn_debug_bot_minimal_symbols': [
+      'android', 'clang', 'asan', 'findbugs', 'gn',
       'debug_bot_minimal_symbols',
     ],
 
-    'android_clang_asan_findbugs_gyp_debug_trybot': [
-      'android', 'clang', 'asan', 'findbugs', 'gyp', 'debug_trybot',
+    'android_clang_asan_findbugs_gn_debug_trybot': [
+      'android', 'clang', 'asan', 'findbugs', 'gn', 'debug_trybot',
     ],
 
     'android_cronet_data_reduction_proxy_gn_release_bot_minimal_symbols': [
@@ -1031,8 +1031,8 @@
       'android', 'gn', 'debug_trybot', 'java_coverage',
     ],
 
-    'android_without_codecs_gyp_release_bot_minimal_symbols': [
-      'android_without_codecs', 'gyp', 'release_bot_minimal_symbols',
+    'android_without_codecs_gn_release_bot_minimal_symbols': [
+      'android_without_codecs', 'gn', 'release_bot_minimal_symbols',
     ],
 
     'cast_gn_release_bot': [
@@ -1435,34 +1435,26 @@
       'swarming', 'android', 'gn', 'release_bot_minimal_symbols',
     ],
 
-    'swarming_android_gyp_debug_static_bot': [
-      'swarming', 'android', 'gyp', 'debug_static_bot',
+    'swarming_android_gn_debug_static_bot': [
+      'swarming', 'android', 'gn', 'debug_static_bot',
     ],
 
-    'swarming_android_gyp_debug_static_bot_arm64': [
-      'swarming', 'android', 'gyp', 'debug_static_bot', 'arm64',
+    'swarming_android_gn_debug_static_bot_arm64': [
+      'swarming', 'android', 'gn', 'debug_static_bot', 'arm64',
     ],
 
-    'swarming_android_gyp_debug_trybot': [
-      'swarming', 'android', 'gyp', 'debug_trybot',
+    'swarming_android_gn_debug_trybot': [
+      'swarming', 'android', 'gn', 'debug_trybot',
     ],
 
-    'swarming_android_gyp_debug_trybot_arm64': [
-      'swarming', 'android', 'gyp', 'debug_trybot', 'arm64',
+    'swarming_android_gn_debug_trybot_arm64': [
+      'swarming', 'android', 'gn', 'debug_trybot', 'arm64',
     ],
 
     'swarming_android_gn_release_trybot': [
       'swarming', 'android', 'gn', 'release_trybot',
     ],
 
-    'swarming_android_gyp_release_bot_minimal_symbols': [
-      'swarming', 'android', 'gyp', 'release_bot_minimal_symbols',
-    ],
-
-    'swarming_android_gyp_release_trybot': [
-      'swarming', 'android', 'gyp', 'release_trybot',
-    ],
-
     ('swarming_gyp_asan_clang_edge_fuzzer'
          '_static_v8_heap_x86_full_symbols_release'): [
       'swarming', 'gyp', 'asan', 'clang_tot', 'edge', 'fuzzer', 'static',