[Android] Switch chromium bots on chromium.android to gn. (RELAND)

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 9466b89cceb9cb8fe687c1506a4ad895b5404121..0dcd9909f22edad8fe0b12dfcb2cb6bc9f889fc6 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -12,13 +12,15 @@
     'android_cast_gyp_debug_static_bot': ['android', 'cast', 'gyp', 'debug_static_bot'],
     'android_clang_asan_gyp_debug_bot': ['android', 'clang', 'asan', 'gyp', 'debug_bot'],\
     'android_gn_debug_bot': ['android', 'gn', 'debug_bot'],
+    'android_gn_debug_static_bot': ['android', 'gn', 'debug_static_bot'],
+    'android_gn_debug_static_bot_arm64': ['android', 'gn', 'debug_static_bot', 'arm64'],
+    'android_gn_debug_static_bot_mipsel': ['android', 'gn', 'debug_static_bot', 'mipsel'],
+    'android_gn_debug_static_bot_x64': ['android', 'gn', 'debug_static_bot', 'x64'],
+    'android_gn_debug_static_bot_x86': ['android', 'gn', 'debug_static_bot', 'x86'],
     'android_gn_release_bot': ['android', 'gn', 'release_bot'],
     'android_gn_release_trybot': ['android', 'gn', 'release_trybot'],
     'android_gyp_debug_static_bot': ['android', 'gyp', 'debug_static_bot'],
     'android_gyp_debug_static_bot_arm64': ['android', 'gyp', 'debug_static_bot', 'arm64'],
-    'android_gyp_debug_static_bot_mipsel': ['android', 'gyp', 'debug_static_bot', 'mipsel'],
-    'android_gyp_debug_static_bot_x64': ['android', 'gyp', 'debug_static_bot', 'x64'],
-    'android_gyp_debug_static_bot_x86': ['android', 'gyp', 'debug_static_bot', 'x86'],
     'android_gyp_release_bot': ['android', 'gyp', 'release_bot'],
     'android_gyp_release_bot_minimal_symbols': ['android', 'gyp', 'release_bot', 'minimal_symbols'],
     'cast_gn_release_bot': ['cast', 'gn', 'release_bot'],
@@ -80,7 +82,7 @@
     'noswarming_gyp_release_bot_mac_strip': ['noswarming', 'gyp', 'release_bot', 'mac_strip'],
     'noswarming_gyp_release_bot_x86': ['noswarming', 'gyp', 'release_bot', 'x86'],
 
-    'swarming_android_gyp_release_bot_minimal_symbols': ['swarming', 'android', 'gyp', 'release_bot', 'minimal_symbols'],
+    'swarming_android_gn_release_bot_minimal_symbols': ['swarming', 'android', 'gn', 'release_bot', 'minimal_symbols'],
     'swarming_asan_lsan_gyp_release_trybot': ['swarming', 'asan', 'lsan', 'release_trybot'],
     'swarming_msan_gyp_release_trybot': ['swarming', 'chromeos', 'msan', 'gyp', 'release_trybot'],
     'swarming_deterministic_gyp_release_bot': ['swarming', 'deterministic', 'gyp', 'release_bot'],
@@ -430,20 +432,20 @@
     },
     'chromium.android': {
       'Android GN Builder (dbg)': 'android_gn_debug_bot',
-      'Android MIPS Builder (dbg)': 'android_gyp_debug_static_bot_mipsel',
-      'Android arm Builder (dbg)': 'android_gyp_debug_static_bot',
-      'Android arm64 Builder (dbg)': 'android_gyp_debug_static_bot_arm64',
-      'Android x64 Builder (dbg)': 'android_gyp_debug_static_bot_x64',
-      'Android x86 Builder (dbg)': 'android_gyp_debug_static_bot_x86',
-      'Jelly Bean Tester': 'android_gyp_debug_static_bot',
-      'KitKat Tablet Tester': 'android_gyp_debug_static_bot',
-      'Lollipop Consumer Tester': 'android_gyp_debug_static_bot_arm64',
-      'Lollipop Low-end Tester': 'android_gyp_debug_static_bot',
-      'Lollipop Phone Tester': 'android_gyp_debug_static_bot',
-      'Lollipop Tablet Tester': 'android_gyp_debug_static_bot',
-      'Marshmallow 64 bit Tester': 'android_gyp_debug_static_bot_arm64',
-      'Marshmallow Tablet Tester': 'android_gyp_debug_static_bot',
-      'Android Swarm Builder': 'swarming_android_gyp_release_bot_minimal_symbols',
+      'Android MIPS Builder (dbg)': 'android_gn_debug_static_bot_mipsel',
+      'Android arm Builder (dbg)': 'android_gn_debug_static_bot',
+      'Android arm64 Builder (dbg)': 'android_gn_debug_static_bot_arm64',
+      'Android x64 Builder (dbg)': 'android_gn_debug_static_bot_x64',
+      'Android x86 Builder (dbg)': 'android_gn_debug_static_bot_x86',
+      'Jelly Bean Tester': 'android_gn_debug_static_bot',
+      'KitKat Tablet Tester': 'android_gn_debug_static_bot',
+      'Lollipop Consumer Tester': 'android_gn_debug_static_bot_arm64',
+      'Lollipop Low-end Tester': 'android_gn_debug_static_bot',
+      'Lollipop Phone Tester': 'android_gn_debug_static_bot',
+      'Lollipop Tablet Tester': 'android_gn_debug_static_bot',
+      'Marshmallow 64 bit Tester': 'android_gn_debug_static_bot_arm64',
+      'Marshmallow Tablet Tester': 'android_gn_debug_static_bot',
+      'Android Swarm Builder': 'swarming_android_gn_release_bot_minimal_symbols',
     },
     'chromium.chrome': {
       'Google Chrome Win': 'gyp_official_goma_minimal_symbols_x86',