Use new common utils where possible.

slave/skia_slave_scripts/flavor_utils/ssh_build_step_utils.py

 # Copyright (c) 2014 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.
 
 """ BuildStepUtils for a remote-execution-via-SSH environment. """
 
 
 from default_build_step_utils import DefaultBuildStepUtils, DeviceDirs
 from slave import slave_utils
 from utils import gs_utils
-from utils import shell_utils
-from utils import ssh_utils
+from py.utils import shell_utils
+from py.utils import ssh_utils
 import os
 import posixpath
 import shutil
 
 
 class SshBuildStepUtils(DefaultBuildStepUtils):
   def __init__(self, build_step_instance):
     DefaultBuildStepUtils.__init__(self, build_step_instance)
     self._unique_prefix = 'skia_'
     args = self._step.args
@@ skipping 153 matching lines @@
       skp_perf_dir=prefix + 'skp_perf',
       playback_actual_images_dir=prefix + 'playback_actual_images',
       playback_actual_summaries_dir=prefix + 'playback_actual_summaries',
       playback_expected_summaries_dir=prefix + 'playback_expected_summaries',
       tmp_dir=prefix + 'tmp_dir')
 
   def MakeClean(self):
     """ Overridden from DefaultBuildStepUtils """
     if os.path.isdir(self._build_dir):
       shutil.rmtree(os.path.realpath(self._build_dir))