Revert of Change FYI win clang builders from official to official_optimize.

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 8abab7a33216141904e4bdd0806c2b5d5e1a5992..3bfe9c958b578f964a074b7c31cace87b43fbaea 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -132,12 +132,12 @@
       'CrWin7Goma(dll)': 'gn_shared_release_bot_minimal_symbols_x86',
       # if CrWinClang is modified, please update CrWinClangGoma in the same way.
       'CrWinClang':
-        'swarming_gn_clang_official_optimize_release_bot_minimal_symbols_x86',
+        'swarming_gn_clang_official_release_bot_minimal_symbols_x86',
       'CrWinClang(dbg)':
         'swarming_gn_clang_debug_bot_minimal_symbols_x86',
       'CrWinClang(dbg) tester': 'none',
       'CrWinClang64':
-        'swarming_gn_clang_official_optimize_release_bot_minimal_symbols_x64',
+        'swarming_gn_clang_official_release_bot_minimal_symbols_x64',
       'CrWinClang tester': 'none',
       'CrWinClang64(dll)':
         'swarming_gn_clang_minimal_symbols_shared_release_bot_x64',
@@ -980,11 +980,9 @@
       'win_chromium_x64_rel_ng': 'swarming_gn_release_trybot_x64',
       'win_clang': 'win_clang_debug_bot',
       'win_clang_dbg': 'swarming_gn_clang_debug_trybot_x86',
-      'win_clang_rel':
-        'swarming_gn_clang_official_optimize_release_trybot_x86',
+      'win_clang_rel': 'swarming_gn_clang_official_release_trybot_x86',
       'win_clang_x64_dbg': 'win_clang_debug_bot',
-      'win_clang_x64_rel':
-        'swarming_gn_clang_official_optimize_release_trybot_x64',
+      'win_clang_x64_rel': 'swarming_gn_clang_official_release_trybot_x64',
       'win_nacl_sdk': 'gn_release_bot_minimal_symbols_x86',
       'win_nacl_sdk_build': 'gn_release_bot_minimal_symbols_x86',
       'win_optional_gpu_tests_rel':
@@ -1838,22 +1836,27 @@
       'x64',
     ],
 
-    'swarming_gn_clang_official_optimize_release_bot_minimal_symbols_x64': [
-      'swarming', 'gn', 'clang', 'official_optimize', 'release_bot',
+    'swarming_gn_clang_official_release_bot_minimal_symbols_x64': [
+      'swarming', 'gn', 'clang', 'official', 'release_bot',
       'minimal_symbols', 'x64',
     ],
 
+    'swarming_gn_clang_official_release_bot_minimal_symbols_x86': [
+      'swarming', 'gn', 'clang', 'official', 'release_bot',
+      'minimal_symbols', 'x86',
+    ],
+
     'swarming_gn_clang_official_optimize_release_bot_minimal_symbols_x86': [
       'swarming', 'gn', 'clang', 'official_optimize', 'release_bot',
       'minimal_symbols', 'x86',
     ],
 
-    'swarming_gn_clang_official_optimize_release_trybot_x64': [
-      'swarming', 'gn', 'clang', 'official_optimize', 'release_trybot', 'x64',
+    'swarming_gn_clang_official_release_trybot_x64': [
+      'swarming', 'gn', 'clang', 'official', 'release_trybot', 'x64',
     ],
 
-    'swarming_gn_clang_official_optimize_release_trybot_x86': [
-      'swarming', 'gn', 'clang', 'official_optimize', 'release_trybot', 'x86',
+    'swarming_gn_clang_official_release_trybot_x86': [
+      'swarming', 'gn', 'clang', 'official', 'release_trybot', 'x86',
     ],
 
     'swarming_gn_clang_shared_release_bot_minimal_symbols_x86': [