Use new common utils where possible.

slave/skia_slave_scripts/sync_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.
 
 
 """Sync the Android sources."""
 
 
 import os
 import shlex
 import sys
 
 from build_step import BuildStep
-from utils import misc
-from utils import shell_utils
+from py.utils import misc
+from py.utils import shell_utils
 from utils.gclient_utils import GIT
 
 
 ANDROID_CHECKOUT_PATH = os.path.join(os.pardir, 'android_repo')
 ANDROID_REPO_URL = ('https://googleplex-android.googlesource.com/a/platform/'
                     'manifest')
 GIT_COOKIE_AUTHDAEMON = os.path.join(os.path.expanduser('~'), 'skia-repo',
                                      'gcompute-tools', 'git-cookie-authdaemon')
 REPO_URL = 'http://commondatastorage.googleapis.com/git-repo-downloads/repo'
 REPO = os.path.join(os.path.expanduser('~'), 'bin', 'repo')
@@ skipping 35 matching lines @@
         shell_utils.run(['chmod', 'a+x', REPO])
 
       with GitAuthenticate():
         shell_utils.run([REPO, 'init', '-u', ANDROID_REPO_URL, '-g',
                          'all,-notdefault,-darwin', '-b', 'master-skia'])
         shell_utils.run([REPO, 'sync', '-j32'])
 
 
 if '__main__' == __name__:
   sys.exit(BuildStep.RunBuildStep(SyncAndroid))