Update buildbot_tool and builders.pyl templates to remove 'master_type'.

scripts/tools/buildbot_tool.py

 #!/usr/bin/python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from __future__ import print_function
 
 import argparse
 import os
 import re
@@ skipping 47 matching lines @@
   builders_path = fs.join(BASE_DIR, master_subpath, 'builders.pyl')
 
   if not fs.exists(builders_path):
     print("%s not found" % master_dirname, file=sys.stderr)
     return 1
 
   values = chromium_utils.ParseBuildersFileContents(
       builders_path,
       fs.read_text_file(builders_path))
 
-  template_dir = fs.join(TEMPLATE_DIR, values['master_type'])
-  for filename in fs.listfiles(template_dir):
-    template = fs.read_text_file(fs.join(template_dir, filename))
+  for filename in fs.listfiles(TEMPLATE_DIR):
+    template = fs.read_text_file(fs.join(TEMPLATE_DIR, filename))
     contents = _expand(template, values,
                        '%s/%s' % (TEMPLATE_SUBPATH, filename),
                        master_subpath)
     fs.write_text_file(fs.join(BASE_DIR, master_subpath, filename), contents)
     print("Wrote %s." % filename)
 
   return 0
 
 
 def run_help(args, fs):
@@ skipping 18 matching lines @@
   replacement = ('# This file was generated from\n'
                  '# %s\n'
                  '# by "scripts/tools/buildbot-tool gen %s".\n'
                  '# DO NOT EDIT BY HAND!\n' %
                  (source, master_subpath))
   return re.sub(pattern, replacement, contents)
 
 
 if __name__ == '__main__':  # pragma: no cover
   sys.exit(main(sys.argv[1:], filesystem.Filesystem()))