[Android] Add a configurable environment for devil/.

build/android/devil/android/device_utils.py

Index: build/android/devil/android/device_utils.py
diff --git a/build/android/devil/android/device_utils.py b/build/android/devil/android/device_utils.py
index 951bae44f7da32e0639993e51de8499054c415bd..af4d5ba2459f30426c0368ea93e1ba93efff6ccf 100644
--- a/build/android/devil/android/device_utils.py
+++ b/build/android/devil/android/device_utils.py
@@ -21,6 +21,7 @@ import time
 import zipfile
 
 from devil import base_error
+from devil import devil_env
 from devil.utils import cmd_helper
 from devil.android import apk_helper
 from devil.android import device_signal
@@ -40,7 +41,6 @@ from devil.utils import parallelizer
 from devil.utils import reraiser_thread
 from devil.utils import timeout_retry
 from devil.utils import zip_utils
-from pylib import constants
 from pylib.device.commands import install_commands
 

[perezju, 2015/09/14 09:13:58]

is this missing the devil_env.InitializeForTests()?

[jbudorick, 2015/09/14 13:12:39]

nope

 _DEFAULT_TIMEOUT = 30
@@ -104,7 +104,7 @@ def GetAVDs():
     A list containing the configured AVDs.
   """
   lines = cmd_helper.GetCmdOutput([
-      os.path.join(constants.ANDROID_SDK_ROOT, 'tools', 'android'),
+      os.path.join(devil_env.instance.android_sdk_path, 'tools', 'android'),
       'list', 'avd']).splitlines()
   avds = []
   for line in lines: