Use new common utils where possible.

slave/skia_slave_scripts/merge_into_android.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.
 
 
 """Merge Skia into Android."""
 
 
 import os
 import sys
 
 from build_step import BuildStep, BuildStepFailure, BuildStepWarning
 import skia_vars
 from sync_android import ANDROID_CHECKOUT_PATH, REPO, GitAuthenticate
-from utils.git_utils import GIT
-from utils import git_utils
-from utils import misc
-from utils import shell_utils
+from py.utils.git_utils import GIT
+from py.utils import git_utils
+from py.utils import misc
+from py.utils import shell_utils
 
 SKIA_REPO_URL = skia_vars.GetGlobalVariable('skia_git_url')
 SKIA_REV_URL = skia_vars.GetGlobalVariable('revlink_tmpl')
 
 MASTER_SKIA_URL = ('https://googleplex-android-review.googlesource.com/'
                    'platform/external/skia')
 MASTER_SKIA_REFS = 'HEAD:refs/heads/master-skia'
 
 UPSTREAM_REMOTE_NAME = 'upstream'
 
@@ skipping 152 matching lines @@
             RepoAbandon(LOCAL_BRANCH_NAME)
             raise BuildStepFailure('git push failed!')
 
           # Our branch is no longer needed. Remove it.
           shell_utils.run([REPO, 'sync', '-j32', '.'])
           shell_utils.run([REPO, 'prune', '.'])
 
 
 if '__main__' == __name__:
   sys.exit(BuildStep.RunBuildStep(MergeIntoAndroid))