[Android] Switch to new interfaces of GetAVDs and RestartAdbServer.

build/android/buildbot/bb_device_steps.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 import collections
 import glob
 import hashlib
 import json
 import os
@@ skipping 378 matching lines @@
 
   # Wait for logcat_monitor to pull existing logcat
   RunCmd(['sleep', '5'])
 
 
 def ProvisionDevices(options):
   bb_annotations.PrintNamedStep('provision_devices')
 
   if not bb_utils.TESTING:
     # Restart adb to work around bugs, sleep to wait for usb discovery.
-    device_utils.DeviceUtils(None).old_interface.RestartAdbServer()
+    device_utils.RestartServer()
     RunCmd(['sleep', '1'])
   provision_cmd = ['build/android/provision_devices.py', '-t', options.target]
   if options.auto_reconnect:
     provision_cmd.append('--auto-reconnect')
   RunCmd(provision_cmd)
 
 
 def DeviceStatusCheck(options):
   bb_annotations.PrintNamedStep('device_status_check')
   cmd = ['build/android/buildbot/bb_device_status_check.py']
@@ skipping 241 matching lines @@
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
   if options.coverage_bucket:
     setattr(options, 'coverage_dir',
             os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))