[Android] Add --adb-path option for tombstones.py.

build/android/provision_devices.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.
 
 """Provisions Android devices with settings required for bots.
 
 Usage:
   ./provision_devices.py [-d <device serial number>]
 """
 
 import argparse
 import datetime
 import json
 import logging
 import os
 import posixpath
 import re
 import subprocess
 import sys
 import time
 
 # Import _strptime before threaded code. datetime.datetime.strptime is
 # threadsafe except for the initial import of the _strptime module.
 # See crbug.com/584730 and https://bugs.python.org/issue7980.
 import _strptime  # pylint: disable=unused-import
 
 import devil_chromium
-from devil import devil_env
 from devil.android import battery_utils
 from devil.android import device_blacklist
 from devil.android import device_errors
 from devil.android import device_temp_file
 from devil.android import device_utils
 from devil.android.sdk import keyevent
 from devil.android.sdk import version_codes
 from devil.constants import exit_codes
 from devil.utils import run_tests_helper
 from devil.utils import timeout_retry
@@ skipping 497 matching lines @@
                       help='Json file to output the device blacklist.')
   parser.add_argument('--chrome-specific-wipe', action='store_true',
                       help='only wipe chrome specific data during provisioning')
   parser.add_argument('--emulators', action='store_true',
                       help='provision only emulators and ignore usb devices')
   args = parser.parse_args()
   constants.SetBuildType(args.target)
 
   run_tests_helper.SetLogLevel(args.verbose)
 
-  devil_custom_deps = None
-  if args.adb_path:
-    devil_custom_deps = {
-      'adb': {
-        devil_env.GetPlatform(): [args.adb_path],
-      },
-    }
-
-  devil_chromium.Initialize(custom_deps=devil_custom_deps)
+  devil_chromium.Initialize(adb_path=args.adb_path)
 
   try:
     return ProvisionDevices(args)
   except (device_errors.DeviceUnreachableError, device_errors.NoDevicesError):
     return exit_codes.INFRA
 
 
 if __name__ == '__main__':
   sys.exit(main())