[recipes] Remove build environment vars from default_env

infra/bots/recipes/swarm_test.py

 # Copyright 2016 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.
 
 
 # Recipe module for Skia Swarming test.
 
 
 DEPS = [
   'build/file',
@@ skipping 145 matching lines @@
   if api.vars.upload_dm_results:
     args.extend(['--writePath', api.flavor.device_dirs.dm_dir])
 
   skip_flag = None
   if api.vars.builder_cfg.get('cpu_or_gpu') == 'CPU':
     skip_flag = '--nogpu'
   elif api.vars.builder_cfg.get('cpu_or_gpu') == 'GPU':
     skip_flag = '--nocpu'
   if skip_flag:
     args.append(skip_flag)
-  args.extend(api.vars.dm_flags)
+  args.extend(api.vars.builder_spec['dm_flags'])
 
   api.run(api.flavor.step, 'dm', cmd=args,
-                abort_on_failure=False,
-                env=api.vars.default_env)
+          abort_on_failure=False,
+          env=api.vars.default_env)
 
   if api.vars.upload_dm_results:
     # Copy images and JSON to host machine if needed.
     api.flavor.copy_directory_contents_to_host(
         api.flavor.device_dirs.dm_dir, api.vars.dm_dir)
 
   # See skia:2789.
   if ('Valgrind' in api.vars.builder_name and
       api.vars.builder_cfg.get('cpu_or_gpu') == 'GPU'):
     abandonGpuContext = list(args)
@@ skipping 276 matching lines @@
     api.path.exists(
         api.path['slave_build'].join('skia'),
         api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
                                      'skimage', 'VERSION'),
         api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
                                      'skp', 'VERSION'),
         api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     ) +
     api.platform('win', 64)
   )