Revert "Remove incorrect named builders ("_" underscores)"

This reverts commit 7d53bc2.

Reason for revert: still referenced by cq.cfg.

Original change's description:
> Remove incorrect named builders ("_" underscores)
> 
> Bug: 868202
> Change-Id: I807807511df39b7a4eac3b699fcd2274d4d24138
> Reviewed-on: https://chromium-review.googlesource.com/c/1343081
> Reviewed-by: Ryan Tseng <hinoka@chromium.org>
> Reviewed-by: John Budorick <jbudorick@chromium.org>
> Commit-Queue: Eric Foo <efoo@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#609559}

TBR=hinoka@chromium.org,efoo@chromium.org,jbudorick@chromium.org

Change-Id: Ic530f835ef9367cda18f54be54dc712d3f229ded
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 868202
Reviewed-on: https://chromium-review.googlesource.com/c/1345234
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609816}

infra/config/global/cr-buildbucket.cfg

@@ -3315,41 +3315,81 @@ buckets {
       mixins: "linux"
       mixins: "blink-try"
     }
+    builders {
+      name: "linux_trusty_blink_rel"
+      mixins: "linux"
+      mixins: "blink-try"
+    }
     builders {
       name: "mac10.10-blink-rel"
       mixins: "mac"
       mixins: "blink-try"
     }
+    builders {
+      name: "mac10.10_blink_rel"
+      mixins: "mac"
+      mixins: "blink-try"
+    }
     builders {
       name: "mac10.11-blink-rel"
       mixins: "mac"
       mixins: "blink-try"
     }
+    builders {
+      name: "mac10.11_blink_rel"
+      mixins: "mac"
+      mixins: "blink-try"
+    }
     builders {
       name: "mac10.12-blink-rel"
       mixins: "mac"
       mixins: "blink-try"
     }
+    builders {
+      name: "mac10.12_blink_rel"
+      mixins: "mac"
+      mixins: "blink-try"
+    }
     builders {
       name: "mac10.13-blink-rel"
       mixins: "mac"
       mixins: "blink-try"
     }
+    builders {
+      name: "mac10.13_blink_rel"
+      mixins: "mac"
+      mixins: "blink-try"
+    }
     builders {
       name: "mac10.13_retina-blink-rel"
       mixins: "mac"
       mixins: "blink-try"
     }
+    builders {
+      name: "mac10.13_retina_blink_rel"
+      mixins: "mac"
+      mixins: "blink-try"
+    }
     builders {
       name: "win10-blink-rel"
       mixins: "win"
       mixins: "blink-try"
     }
+    builders {
+      name: "win10_blink_rel"
+      mixins: "win"
+      mixins: "blink-try"
+    }
     builders {
       name: "win7-blink-rel"
       mixins: "win"
       mixins: "blink-try"
     }
+    builders {
+      name: "win7_blink_rel"
+      mixins: "win"
+      mixins: "blink-try"
+    }
   }
 }
 

infra/config/global/luci-milo.cfg

@@ -4425,6 +4425,38 @@ consoles {
     name: "buildbot/tryserver.blink/win7-blink-rel"
     name: "buildbucket/luci.chromium.try/win7-blink-rel"
   }
+  builders {
+    name: "buildbot/tryserver.blink/linux_trusty_blink_rel"
+    name: "buildbucket/luci.chromium.try/linux_trusty_blink_rel"
+  }
+  builders {
+    name: "buildbot/tryserver.blink/mac10.10_blink_rel"
+    name: "buildbucket/luci.chromium.try/mac10.10_blink_rel"
+  }
+  builders {
+    name: "buildbot/tryserver.blink/mac10.11_blink_rel"
+    name: "buildbucket/luci.chromium.try/mac10.11_blink_rel"
+  }
+  builders {
+    name: "buildbot/tryserver.blink/mac10.13_retina_blink_rel"
+    name: "buildbucket/luci.chromium.try/mac10.13_retina_blink_rel"
+  }
+  builders {
+    name: "buildbot/tryserver.blink/mac10.12_blink_rel"
+    name: "buildbucket/luci.chromium.try/mac10.12_blink_rel"
+  }
+  builders {
+    name: "buildbot/tryserver.blink/mac10.13_blink_rel"
+    name: "buildbucket/luci.chromium.try/mac10.13_blink_rel"
+  }
+  builders {
+    name: "buildbot/tryserver.blink/win10_blink_rel"
+    name: "buildbucket/luci.chromium.try/win10_blink_rel"
+  }
+  builders {
+    name: "buildbot/tryserver.blink/win7_blink_rel"
+    name: "buildbucket/luci.chromium.try/win7_blink_rel"
+  }
   builder_view_only: true
 }
 

tools/mb/mb_config.pyl

@@ -547,6 +547,15 @@
       'mac10.13_retina-blink-rel': 'release_bot_minimal_symbols',
       'win7-blink-rel': 'release_bot_x86_minimal_symbols',
       'win10-blink-rel': 'release_bot_x86_minimal_symbols',
+      # TODO(dpranke): Delete all the old names once things have been updated.
+      'linux_trusty_blink_rel': 'release_bot_minimal_symbols',
+      'mac10.10_blink_rel': 'release_bot_minimal_symbols',
+      'mac10.11_blink_rel': 'release_bot_minimal_symbols',
+      'mac10.12_blink_rel': 'release_bot_minimal_symbols',
+      'mac10.13_blink_rel': 'release_bot_minimal_symbols',
+      'mac10.13_retina_blink_rel': 'release_bot_minimal_symbols',
+      'win7_blink_rel': 'release_bot_x86_minimal_symbols',
+      'win10_blink_rel': 'release_bot_x86_minimal_symbols',
     },
 
     'tryserver.chromium.android': {