Fix merge problems in r38573, a cleanup of build scripts.

tools/bots/functional_testing.py

 #!/usr/bin/python
 
 # Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 """
 Buildbot steps for functional testing master and slaves
 """
 
@@ skipping 60 matching lines @@
     Run(['unzip', local_path, '-d', editor_location])
 
 def FTMaster(config):
   run = int(os.environ['BUILDBOT_ANNOTATED_STEPS_RUN'])
   with bot.BuildStep('Master run %s' % run):
     if run == 1:
       print 'Not doing anything on master before the triggers'
       return
     else:
       builddir = os.path.join(bot_utils.DART_DIR,
-                              utils.GetBuildDir(HOST_OS, HOST_OS),
+                              utils.GetBuildDir(HOST_OS),
                               'functional_testing')
       shutil.rmtree(builddir, ignore_errors=True)
       os.makedirs(builddir)
       script_locations = os.path.join(bot_utils.DART_DIR, 'editor', 'ft')
       Run(['/home/chrome-bot/func-test/bot-run', builddir, script_locations])
 
 def FTSteps(config):
   if config.builder_tag == 'master':
     FTMaster(config)
   else:
     FTSlave(config)
-  
+
 if __name__ == '__main__':
   bot.RunBot(SrcConfig, FTSteps, build_step=None)