Revert of Switch Android Builder on chromium.webkit 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 a map of buildbot master names -> buildbot builder names ->
   # config names (where each config name is a key in the 'configs' dict,
   # below). MB uses this dict to look up which config to use for a given bot.
   'masters': {
     # Take care when changing any of these builders to ensure that you do not
@@ skipping 495 matching lines @@
         'swarming_gpu_tests_gyp_release_trybot_minimal_symbols_x86',
     },
 
     'client.v8.fyi': {
       'Linux Debug Builder': 'gn_debug_bot',
       'V8 Android GN (dbg)': 'android_gn_debug_bot',
       'V8 Linux GN': 'gn_release_bot',
     },
 
     'chromium.webkit': {
-      'Android Builder': 'android_gn_release_bot_minimal_symbols',
-      'WebKit Android (Nexus4)': 'none',
+      'Android Builder': 'gyp_release_bot_android',
+      'WebKit Android (Nexus4)': 'gyp_release_bot_android',
       'WebKit Linux (dbg)': 'swarming_gn_debug_bot_x64',
       'WebKit Linux ASAN': 'swarming_gn_asan_lsan_release_bot_x64',
       'WebKit Linux Leak': 'swarming_gn_release_bot_x64',
       'WebKit Linux MSAN': 'swarming_gn_msan_release_bot_x64',
       'WebKit Linux Trusty': 'swarming_gn_release_bot_x64',
       'WebKit Linux': 'swarming_gn_release_bot_x64',
       'WebKit Mac Builder (dbg)': 'swarming_gyp_debug_bot',
       'WebKit Mac Builder': 'swarming_gyp_release_bot_x64',
       'WebKit Mac10.10': 'none',
       'WebKit Mac10.11 (dbg)': 'none',
@@ skipping 767 matching lines @@
     ],
 
     'gyp_official_x64': [
       'gyp', 'official', 'x64',
     ],
 
     'gyp_release_bot': [
       'gyp', 'release_bot',
     ],
 
+    'gyp_release_bot_android': [
+      'gyp', 'release_bot', 'android',
+    ],
+
     'gyp_release_bot_x86': [
       'gyp', 'release_bot', 'x86',
     ],
 
     'gyp_release_trybot': [
       'gyp', 'release_trybot',
     ],
 
     'gyp_release_trybot_x64': [
       'gyp', 'release_trybot', 'x64',
@@ skipping 933 matching lines @@
     },
 
     'drfuzz': { 'gn_args': 'use_drfuzz=true' },
 
     'drmemory': {
       'gn_args': 'is_component_build=true enable_iterator_debugging=false',
       'gyp_defines': 'component=shared_library build_for_tool=drmemory',
     },
   },
 }