Use new common utils where possible.

slave/skia_slave_scripts/update.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.
 
 """ Check out the Skia sources. """
 
 
+from build_step import BuildStep, BuildStepFailure
+
 from common import chromium_utils
-from utils.git_utils import GIT
+from py.utils.git_utils import GIT
 from utils import file_utils
 from utils import gclient_utils
-from utils import misc
-from utils import shell_utils
-from build_step import BuildStep, BuildStepFailure
+from py.utils import misc
+from py.utils import shell_utils
 
 import ast
 import config_private
 import os
 import re
 import sys
 
 
 LOCAL_GIT_MIRROR_URL = 'http://192.168.1.120/git-mirror/skia'
 SKIA_GIT_URL_TO_REPLACE = config_private.SKIA_GIT_URL[:-len('.git')]
@@ skipping 156 matching lines @@
       raise BuildStepFailure('Actually-synced revision "%s" is different from '
                              'the requested revision "%s".' % (
                                   repr(got_revision), repr(self._revision)))
 
     # Print the obtained revision number so that the master can parse it.
     print 'Skia updated to %s' % got_revision
 
 
 if '__main__' == __name__:
   sys.exit(BuildStep.RunBuildStep(Update))