Move Mojo bots to chromium_fyi; remove mojo master.

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 d105337e262e0c8c402ac14ec776aec832276398..d7a7f0ebabe9a3133bc04cbd4aa0b2b6217425e6 100644
--- a/masters/master.chromium.fyi/master.cfg
+++ b/masters/master.chromium.fyi/master.cfg
@@ -148,6 +148,8 @@ s_chromium = Scheduler(
                   'WebKit Win - WPTServe',
                   'Linux remote_run Builder',
                   'EarlGreyiOS',
+                  'Mojo ChromiumOS',
+                  'Mojo Windows',
                   ])
 
 # Triggerable scheduler for Android Builder
@@ -1164,7 +1166,21 @@ b_earlgrey_ios = {
   'factory': annotator_factory.AnnotatorFactory().BaseFactory(
     'ios/unified_builder_tester'
   ),
-  'category': 'ealrgrey',
+  'category': 'earlgrey',
+  'auto_reboot': True,
+}
+
+b_mojo_chromiumos = {
+  'name': 'Mojo ChromiumOS',
+  'factory': m_annotator.BaseFactory('chromium'),
+  'category': 'mojo',
+  'auto_reboot': True,
+}
+
+b_mojo_windows = {
+  'name': 'Mojo Windows',
+  'factory': m_annotator.BaseFactory('chromium'),
+  'category': 'mojo',
   'auto_reboot': True,
 }
 
@@ -1324,6 +1340,10 @@ c['builders'] = [
 
   # EarlGrey bot
   b_earlgrey_ios,
+
+  # Mojo bots.
+  b_mojo_chromiumos,
+  b_mojo_windows,
 ]
 
 c['builders'].extend([