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

tools/build.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012, 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.
 #
 
 import optparse
 import os
 import re
@@ skipping 406 matching lines @@
     if HOST_OS == 'freebsd':
       make = 'gmake'
       # work around lack of flock
       os.environ['LINK'] = '$(CXX)'
     args = [make,
             '-j',
             options.j,
             'BUILDTYPE=' + build_config,
             ]
     if target_os != HOST_OS:
-      args += ['builddir_name=' + utils.GetBuildDir(HOST_OS, target_os)]
+      args += ['builddir_name=' + utils.GetBuildDir(HOST_OS)]
     if options.verbose:
       args += ['V=1']
 
     args += [target]
 
   toolsOverride = None
   if override_tools:
     toolsOverride = SetTools(arch, target_os, options)
   if toolsOverride:
     for k, v in toolsOverride.iteritems():
@@ skipping 96 matching lines @@
           else:
             if BuildOneConfig(options, target, target_os,
                               mode, arch, cross_build) != 0:
               return 1
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(Main())