| 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 b169240578f56a69842982990bb5a5a647d13afb..dd0aeebf0f0d46d3eab8e68c0a22957d7019ad4b 100644
 | 
| --- a/build/android/devil/android/device_utils.py
 | 
| +++ b/build/android/devil/android/device_utils.py
 | 
| @@ -22,6 +22,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
 | 
|  
 | 
|  _DEFAULT_TIMEOUT = 30
 | 
| @@ -105,7 +105,8 @@ 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.config.LocalPath('android_sdk'),
 | 
| +                   'tools', 'android'),
 | 
|        'list', 'avd']).splitlines()
 | 
|    avds = []
 | 
|    for line in lines:
 | 
| 
 |