Revert of Flip remaining non-lkgr linux memory bots 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 fa53ce357798c45025b55448ccba6d31756e5fba..074baee27f89c2626e78274d0356f86110a8db86 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -350,24 +350,13 @@
       'iOS_Simulator_GN_(dbg)': 'ios_gn',
     },
 
-    'chromium.memory': {
-      'Linux ASAN LSAN Builder': 'swarming_asan_lsan_gn_release_bot',
-      'Linux ASAN LSAN Tests (1)': 'none',
-      'Linux ASAN LSAN Tests (sandboxed)': 'none',
-      'Mac ASAN 64 Builder': 'swarming_asan_lsan_full_symbols_gyp_release_bot',
-      'Mac ASAN 64 Tests (1)': 'none',
-      'Linux Chromium OS ASAN LSAN Builder':
-        'swarming_asan_lsan_chromeos_gyp_release_bot',
-      'Linux Chromium OS ASAN LSAN Tests (1)': 'none',
-    },
-
     'chromium.memory.fyi': {
       'Chromium Linux ChromeOS MSan Builder':
         'swarming_gyp_chromeos_msan_release_bot',
       'Chromium Linux MSan Builder':
-        'swarming_msan_gn_release_bot',
+        'swarming_gyp_msan_release_bot',
       'Chromium Linux TSan Builder':
-        'swarming_tsan_disable_nacl_gn_release_bot',
+        'swarming_gyp_tsan_disable_nacl_release_bot',
       'Chromium Windows Builder (DrMemory x64)':
         'gyp_drmemory_shared_release_x64',
       'Chromium Windows Builder (DrMemory)': 'gyp_drmemory_shared_release_x86',
@@ -699,7 +688,7 @@
       'chromium_presubmit': 'none',
       'linux_arm': 'swarming_gyp_release_trybot_arm',
       'linux_chromium_archive_rel_ng': 'noswarming_gn_release_bot',
-      'linux_chromium_asan_rel_ng': 'swarming_asan_lsan_gn_release_trybot',
+      'linux_chromium_asan_rel_ng': 'swarming_asan_lsan_gyp_release_trybot',
       'linux_chromium_asan_variable': 'findit',
       'linux_chromium_browser_side_navigation_rel': 'gyp_release_trybot',
       'linux_chromium_cast_variable': 'findit',
@@ -730,11 +719,12 @@
       'linux_chromium_gn_chromeos_rel': 'chromeos_ozone_gn_release_trybot',
       'linux_chromium_gn_chromeos_variable': 'findit',
       'linux_chromium_gn_upload': 'gn_linux_upload',
-      'linux_chromium_msan_rel_ng': 'swarming_msan_gn_release_trybot',
+      'linux_chromium_msan_rel_ng': 'swarming_msan_gyp_release_trybot',
       'linux_chromium_practice_rel_ng': 'gyp_release_trybot',
       'linux_chromium_rel_ng': 'swarming_gpu_tests_gn_release_trybot',
+      'linux_chromium_tsan_rel_ng': 'swarming_tsan_gyp_release_trybot',
       'linux_chromium_tsan_rel_ng':
-        'swarming_tsan_disable_nacl_gn_release_trybot',
+        'swarming_gyp_tsan_disable_nacl_release_trybot',
       'linux_chromium_variable': 'findit',
       'linux_chromium_variable_32': 'findit',
       'linux_chromium_variable_chrome': 'findit',
@@ -1469,24 +1459,12 @@
       'swarming', 'asan', 'dcheck_always_on', 'gyp', 'release_bot',
     ],
 
+    'swarming_asan_lsan_gyp_release_trybot': [
+      'swarming', 'asan', 'lsan', 'release_trybot',
+    ],
+
     'swarming_asan_lsan_chromeos_gyp_release_trybot': [
       'swarming', 'asan', 'lsan', 'chromeos', 'release_trybot',
-    ],
-
-    'swarming_asan_lsan_gn_release_bot': [
-      'swarming', 'asan', 'lsan', 'gn', 'release_bot',
-    ],
-
-    'swarming_asan_lsan_gn_release_trybot': [
-      'swarming', 'asan', 'lsan', 'gn', 'release_trybot',
-    ],
-
-    'swarming_asan_lsan_chromeos_gyp_release_bot': [
-      'swarming', 'asan', 'lsan', 'chromeos', 'gyp', 'release_bot',
-    ],
-
-    'swarming_asan_lsan_full_symbols_gyp_release_bot': [
-      'swarming', 'asan', 'lsan', 'full_symbols', 'gyp', 'release_bot',
     ],
 
     'swarming_chromeos_gn_release_trybot': [
@@ -1545,14 +1523,6 @@
       'swarming', 'gpu_tests', 'gyp', 'release_trybot',
     ],
 
-    'swarming_msan_gn_release_bot': [
-      'swarming', 'msan', 'gn', 'release_bot',
-    ],
-
-    'swarming_msan_gn_release_trybot': [
-      'swarming', 'msan', 'gn', 'release_trybot',
-    ],
-
     'swarming_msan_gyp_release_trybot': [
       'swarming', 'chromeos', 'msan', 'gyp', 'release_trybot',
     ],
@@ -1773,6 +1743,10 @@
       'swarming', 'gyp', 'debug_trybot', 'x86',
     ],
 
+    'swarming_gyp_msan_release_bot': [
+      'swarming', 'gyp', 'msan', 'release_bot',
+    ],
+
     'swarming_gyp_release_bot': [
       'swarming', 'gyp', 'release_bot',
     ],
@@ -1810,12 +1784,12 @@
       'x86',
     ],
 
-    'swarming_tsan_disable_nacl_gn_release_bot': [
-      'swarming', 'tsan', 'disable_nacl', 'gn', 'release_bot',
-    ],
-
-    'swarming_tsan_disable_nacl_gn_release_trybot': [
-      'swarming', 'tsan', 'disable_nacl', 'gn', 'release_trybot',
+    'swarming_gyp_tsan_disable_nacl_release_bot': [
+      'swarming', 'gyp', 'tsan', 'disable_nacl', 'release_bot',
+    ],
+
+    'swarming_gyp_tsan_disable_nacl_release_trybot': [
+      'swarming', 'gyp', 'tsan', 'disable_nacl', 'release_trybot',
     ],
 
     'gn_debug_bot_minimal_symbols_chrome_with_codecs': [