Revert of [Android] Always use devil's adb in the perf recipes. (RELAND)

infra/recipes/android/perf.py

 # Copyright 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.
 
 from recipe_engine.types import freeze
 
 
 DEPS = [
     'build/adb',
     'build/chromium',
@@ skipping 138 matching lines @@
         api.chromium_tests.get_compile_targets_for_scripts().json.output
 
     builder['tests'] = api.chromium_tests.generate_tests_from_test_spec(
         api, test_spec, builder, buildername, mastername, False, None,
         scripts_compile_targets, [api.chromium_tests.steps.generate_script],
         bot_update_step)
 
   api.path['checkout'] = api.path['slave_build'].join('src')
   api.chromium_android.clean_local_files()
 
-  # TODO(jbudorick): Remove this after resolving
-  # https://github.com/catapult-project/catapult/issues/2901
-  devil_path = api.path['checkout'].join('third_party', 'catapult', 'devil')
-  api.python.inline(
-      'initialize devil',
-      """
-      import sys
-      sys.path.append(sys.argv[1])
-      from devil import devil_env
-      devil_env.config.Initialize()
-      devil_env.config.PrefetchPaths(dependencies=['adb'])
-      """,
-      args=[devil_path])
-  api.adb.set_adb_path(
-      devil_path.join('bin', 'deps', 'linux2', 'x86_64', 'bin', 'adb'))
-
   api.chromium_android.download_build(bucket=builder['bucket'],
     path=builder['path'](api))
 
   api.chromium_android.common_tests_setup_steps(
       perf_setup=True,
       remove_system_webview=builder.get('remove_system_webview', False))
 
   required_apks = builder.get('required_apks', [])
   for apk in required_apks:
     api.chromium_android.adb_install_apk(apk)
@@ skipping 182 matching lines @@
                        "adb_status": "device",
                        "imei_slice": "",
                        "ro.build.product": "bullhead",
                        "ro.build.id": "MDB08Q",
                        "serial": "00d0d567893340f4",
                        "wifi_ip": ""
                     }]
                 }}),
           retcode=87))