Switch android bots on chromium.fyi 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 481e4775502461194888d73f85064a7944f2bede..f0cd4fa190f648f278e599495dbb423c8c7cab77 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -101,7 +101,7 @@
       'Chromium Win x64 Clobber': 'tbd',
       'ChromiumOS Linux Tests': 'tbd',
       'ClangToTAndroidASan':
-        'android_clang_no_chrome_plugins_asan_gyp_debug_bot_minimal_symbols',
+        'android_clang_no_chrome_plugins_asan_gn_debug_bot_minimal_symbols',
       'ClangToTLinux': 'tbd',
       'ClangToTLinux (dbg)': 'tbd',
       'ClangToTLinuxASan': 'tbd',
@@ -146,13 +146,13 @@
       'Windows Tests (DrMemory)': 'tbd',
 
       'Android ChromeDriver Tests (dbg)': 'none',
-      'Android Cloud Tests': 'android_gyp_debug_static_bot_x86',
+      'Android Cloud Tests': 'android_gn_debug_static_bot_x86',
       'Android Remoting Tests': 'none',
       'Android Tests (trial)(dbg)': 'none',
-      'Android Tests (x86 emulator)': 'android_gyp_debug_static_bot_x86',
+      'Android Tests (x86 emulator)': 'android_gn_debug_static_bot_x86',
       'Android Asan Builder Tests (dbg)':
-          'android_asan_gyp_debug_bot_minimal_symbols',
-      'Android Builder (dbg)': 'android_gyp_debug_static_bot',
+          'android_asan_gn_debug_bot_minimal_symbols',
+      'Android Builder (dbg)': 'android_gn_debug_static_bot',
       'CFI Linux CF': 'gn_cfi_diag_release_bot',
       'CFI Linux ToT': 'gn_cfi_release_bot',
       'CFI Linux': 'gn_cfi_release_bot',
@@ -894,16 +894,16 @@
   # is not necessarily so (i.e., we might have mac, win, and linux
   # bots all using the 'gn_release_bot' config).
   'configs': {
-    'android_asan_gyp_debug_bot_minimal_symbols': [
-      'android', 'asan', 'gyp', 'debug_bot_minimal_symbols',
+    'android_asan_gn_debug_bot_minimal_symbols': [
+      'android', 'asan', 'gn', 'debug_bot_minimal_symbols',
     ],
 
     'android_cast_gyp_debug_static_bot': [
       'android', 'cast', 'gyp', 'debug_static_bot',
     ],
 
-    'android_clang_no_chrome_plugins_asan_gyp_debug_bot_minimal_symbols': [
-      'android', 'clang_no_chrome_plugins', 'asan', 'gyp',
+    'android_clang_no_chrome_plugins_asan_gn_debug_bot_minimal_symbols': [
+      'android', 'clang_no_chrome_plugins', 'asan', 'gn',
       'debug_bot_minimal_symbols',
     ],
 
@@ -1017,10 +1017,6 @@
       'android', 'gyp', 'debug_static_bot', 'arm64',
     ],
 
-    'android_gyp_debug_static_bot_x86': [
-      'android', 'gyp', 'debug_static_bot', 'x86',
-    ],
-
     'android_without_codecs_gyp_release_bot_minimal_symbols': [
       'android_without_codecs', 'gyp', 'release_bot_minimal_symbols',
     ],