Use new common utils where possible.

slave/skia_slave_scripts/do_skps_capture.py

 #!/usr/bin/env python
 # 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.
 
 
 """Run the webpages_playback automation script."""
 
 
 import os
 import posixpath
 import sys
 
 from build_step import BuildStep
 from utils import gs_utils
-from utils import shell_utils
+from py.utils import shell_utils
 
 
 class SKPsCapture(BuildStep):
   """BuildStep that captures the buildbot SKPs."""
 
   def __init__(self, timeout=10800, **kwargs):
     super(SKPsCapture, self).__init__(timeout=timeout, **kwargs)
 
   def _get_skp_version(self):
     """Find an unused SKP version."""
@@ skipping 49 matching lines @@
       ]
       try:
         shell_utils.run(cleanup_cmd)
       except Exception:
         # Do not fail the build step if the cleanup command fails.
         pass
 
 
 if '__main__' == __name__:
   sys.exit(BuildStep.RunBuildStep(SKPsCapture))