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

scripts/tools/buildbot_tool.py

Index: scripts/tools/buildbot_tool.py
diff --git a/scripts/tools/buildbot_tool.py b/scripts/tools/buildbot_tool.py
index 0c1fe984f745a351a905f43fdcaa1c6256cc72f3..48127885bab60e7e8c61b07126f97c84bc312975 100755
--- a/scripts/tools/buildbot_tool.py
+++ b/scripts/tools/buildbot_tool.py
@@ -65,9 +65,8 @@ def run_gen(args, fs):
       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)