Use new common utils where possible.

slave/skia_slave_scripts/flavor_utils/default_build_step_utils.py

 # Copyright (c) 2013 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.
 
 """ Utilities for generic build steps. """
 
 import os
 import shutil
 import sys
 
 from utils import file_utils
-from utils import shell_utils
+from py.utils import shell_utils
 
 
 class DeviceDirs(object):
   def __init__(self, perf_data_dir, gm_actual_dir, gm_expected_dir,
                resource_dir, skimage_in_dir, skimage_expected_dir,
                skimage_out_dir, skp_dir, skp_perf_dir,
                playback_actual_images_dir, playback_actual_summaries_dir,
                playback_expected_summaries_dir, tmp_dir):
     self._perf_data_dir = perf_data_dir
     self._gm_actual_dir = gm_actual_dir
@@ skipping 222 matching lines @@
         skimage_expected_dir=os.path.join(os.pardir, os.pardir, 'skimage',
                                           'expected'),
         skimage_out_dir=self._step.skimage_out_dir,
         skp_dir=self._step.skp_dir,
         skp_perf_dir=self._step.perf_data_dir,
         playback_actual_images_dir=self._step.playback_actual_images_dir,
         playback_actual_summaries_dir=self._step.playback_actual_summaries_dir,
         playback_expected_summaries_dir=(
             self._step.playback_expected_summaries_dir),
         tmp_dir=os.path.join(os.pardir, 'tmp'))