Move WinClang from FYI to main waterfall.

masters/master.chromium.fyi/master.cfg

Index: masters/master.chromium.fyi/master.cfg
diff --git a/masters/master.chromium.fyi/master.cfg b/masters/master.chromium.fyi/master.cfg
index b8b0499188d4227f06b033051a422e987f89beb2..53d895b739dbb8a60fbd9dac323cf0861f30036c 100644
--- a/masters/master.chromium.fyi/master.cfg
+++ b/masters/master.chromium.fyi/master.cfg
@@ -75,7 +75,6 @@ s_chromium = Scheduler(
                   'CrWin7Goma(dbg)',
                   'CrWin7Goma(clbr)',  # not (clobber) cause crbug.com/399990
                   'CrWinClangGoma',
-                  'WinClang',
                   'CrWinClang',
                   'CrWinClang(dbg)',
                   'CrWinClang(shared)',
@@ -568,13 +567,6 @@ b_chromium_win_x64 = {
   'auto_reboot': False,
 }
 
-b_win_clang = {
-  'name': 'WinClang',
-  'factory': m_annotator.BaseFactory('chromium'),
-  'category': 'win clang',
-  'auto_reboot': False,
-}
-
 b_chromium_win_clang = {
   'name': 'CrWinClang',
   'factory': m_annotator.BaseFactory('chromium', triggers=['cr_win_clang']),
@@ -1308,7 +1300,6 @@ c['builders'] = [
   b_chromium_win_clang_goma,
   b_windows_8_app_certification,
   b_chromium_win_x64,
-  b_win_clang,
   b_chromium_win_clang,
   b_chromium_win_clang_tester,
   b_chromium_win_clang_dbg,