Revert of [Android] Add a configurable environment for devil/. (RELAND 2)

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 2c640b785262c5f33b713b29d8763dffc8351a20..400c51731a7930b4bd0e7d9b4bf527bd6591b6b5 100644
--- a/build/android/devil/android/device_utils.py
+++ b/build/android/devil/android/device_utils.py
@@ -22,7 +22,6 @@
 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
@@ -42,6 +41,7 @@
 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
@@ -107,8 +107,7 @@
     A list containing the configured AVDs.
   """
   lines = cmd_helper.GetCmdOutput([
-      os.path.join(devil_env.config.LocalPath('android_sdk'),
-                   'tools', 'android'),
+      os.path.join(constants.ANDROID_SDK_ROOT, 'tools', 'android'),
       'list', 'avd']).splitlines()
   avds = []
   for line in lines: