[cronet] Switch pylib.device -> devil equivalents.

components/cronet/android/test/javaperftests/run.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 """This script runs an automated Cronet performance benchmark.
 
 This script:
 1. Sets up "USB reverse tethering" which allow network traffic to flow from
    an Android device connected to the host machine via a USB cable.
@@ skipping 29 matching lines @@
 from time import sleep
 import urllib
 
 REPOSITORY_ROOT = os.path.abspath(os.path.join(
     os.path.dirname(__file__), '..', '..', '..', '..', '..'))
 
 sys.path.append(os.path.join(REPOSITORY_ROOT, 'tools', 'perf'))
 from chrome_telemetry_build import chromium_config
 sys.path.append(chromium_config.GetTelemetryDir())
 sys.path.append(os.path.join(REPOSITORY_ROOT, 'build', 'android'))
+sys.path.append(os.path.join(
+    REPOSITORY_ROOT, 'third_party', 'catapult', 'devil'))
 
 import android_rndis_forwarder
+from devil.android import device_utils
+from devil.android.sdk import intent
 import lighttpd_server
 from pylib import constants
 from pylib import pexpect
-from pylib.device import device_utils
-from pylib.device import intent
 from telemetry import android
 from telemetry import benchmark
 from telemetry import benchmark_runner
 from telemetry import project_config
 from telemetry import story
 from telemetry.value import scalar
 from telemetry.web_perf import timeline_based_measurement
 
 BUILD_TYPE = 'Release'
 BUILD_DIR = os.path.join(REPOSITORY_ROOT, 'out', BUILD_TYPE)
@@ skipping 265 matching lines @@
   benchmark_runner.main(runner_config)
   # Shutdown.
   quic_server.ShutdownQuicServer()
   shutil.rmtree(quic_server_doc_root)
   http_server.ShutdownHttpServer()
   shutil.rmtree(http_server_doc_root)
 
 
 if __name__ == '__main__':
   main()