Revert of [Android] Switch chromium bots on chromium.android to gn.

tools/mb/mb_config.pyl

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   # This is the list of configs that you can pass to mb; each config
   # represents a particular combination of GYP_DEFINES/gn args that
   # we must support. A given config *may* be platform-specific but
   # is not necessarily so (i.e., we might have mac, win, and linux
   # bots all using the 'gn_release_bot' config).
   'configs': {
     '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_gyp_release_bot': ['cast', 'gyp', 'release_bot'],
     'cast_gyp_release_trybot': ['cast', 'gyp', 'release_trybot'],
     'chromeos_gn_debug_bot': ['chromeos', 'gn', 'debug_bot'],
     'chromeos_ozone_gn_release_bot': ['chromeos', 'ozone', 'gn', 'release_bot'],
     'chromeos_ozone_gn_release_trybot': ['chromeos', 'ozone', 'gn', 'release_trybot'],
     'dev_gn_debug': ['gn', 'debug', 'shared', 'full_symbols'],
     'dev_gn_release': ['gn', 'release', 'shared'],
     'dev_gyp_debug': ['gyp', 'debug', 'shared', 'full_symbols'],
@@ skipping 41 matching lines @@
 
     # This is just for completeness; any bot that uses this config
     # should never actually run MB.
     'none': ['none'],
 
     'noswarming_gn_release_bot': ['noswarming', 'gn', 'release_bot'],
     'noswarming_gyp_release_bot': ['noswarming', 'gyp', 'release_bot'],
     'noswarming_gyp_release_bot_mac_strip': ['noswarming', 'gyp', 'release_bot', 'mac_strip'],
     'noswarming_gyp_release_bot_x86': ['noswarming', 'gyp', 'release_bot', 'x86'],
 
-    'swarming_android_gn_release_bot_minimal_symbols': ['swarming', 'android', 'gn', 'release_bot', 'minimal_symbols'],
+    'swarming_android_gyp_release_bot_minimal_symbols': ['swarming', 'android', 'gyp', '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'],
     'swarming_gpu_fyi_tests_gn_debug_bot': ['swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gn', 'debug_bot'],
     'swarming_gpu_fyi_tests_gn_release_bot': ['swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gn', 'release_bot'],
     'swarming_gpu_tests_gn_release_trybot': ['swarming', 'gpu_tests', 'gn', 'release_trybot'],
     'swarming_gpu_tests_gyp_debug_trybot': ['swarming', 'gpu_tests', 'gyp', 'debug_trybot'],
     'swarming_gpu_tests_gyp_release_trybot': ['swarming', 'gpu_tests', 'gyp', 'release_trybot'],
     'swarming_gn_debug_bot': ['swarming', 'gn', 'debug_bot'],
     'swarming_gn_debug_bot_minimal_symbols_x64': ['swarming', 'gn', 'debug_bot_minimal_symbols', 'x64'],
@@ skipping 329 matching lines @@
     },
     'chromium': {
       'Win': 'noswarming_gyp_release_bot',
       'Mac': 'noswarming_gyp_release_bot_mac_strip',
       'Linux x64': 'noswarming_gn_release_bot',
       'Linux': 'noswarming_gyp_release_bot_x86',
       'Android': 'android_gyp_release_bot_minimal_symbols',
     },
     'chromium.android': {
       'Android GN Builder (dbg)': 'android_gn_debug_bot',
-      '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',
+      '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',
     },
     'chromium.chrome': {
       'Google Chrome Win': 'gyp_official_goma_minimal_symbols_x86',
       'Google Chrome Linux': 'gyp_official_goma_x86',
       'Google Chrome Linux x64': 'gn_official_goma',
       'Google Chrome Mac': 'gyp_official_goma',
       'Google Chrome ChromeOS': 'gyp_official_goma_chromeos',
     },
     'chromium.chromiumos': {
       'Linux ChromiumOS GN': 'chromeos_ozone_gn_release_bot',
@@ skipping 232 matching lines @@
       'win8_chromium_gn_upload': 'gn_release_bot_minimal_symbols_x86',
       'win_clang_x64_dbg': 'win_clang_debug_bot',
     },
     'tryserver.v8': {
       'v8_linux_chromium_gn_rel': 'gn_release_trybot',
       'v8_android_chromium_gn_dbg': 'android_gn_debug_bot',
       'v8_linux_blink_rel': 'swarming_gn_release_trybot_minimal_symbols_x64',
     },
   },
 }