Use new common utils where possible.

slave/skia_slave_scripts/apply_patch.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 
 """ Apply a diff to patch a Skia checkout. """
 
 
 from ast import literal_eval
 from build_step import BuildStep, BuildStepFailure
-from utils import shell_utils
-from utils.git_utils import GIT
+from py.utils import shell_utils
+from py.utils.git_utils import GIT
 import os
 import shutil
 import sys
 import tempfile
 import urllib
 import urllib2
 
 
 if os.name == 'nt':
   SVN = 'svn.bat'
@@ skipping 51 matching lines @@
         patch_level = (patch_level + 1) % 2
         print 'Trying patch level %d instead...' % patch_level
       shell_utils.run(get_patch_cmd(patch_level, patch_file.name))
 
     finally:
       shutil.rmtree(temp_dir)
 
 
 if '__main__' == __name__:
   sys.exit(BuildStep.RunBuildStep(ApplyPatch))