[Android] Add a configurable environment for devil/.

build/android/devil/android/sdk/aapt.py

Index: build/android/devil/android/sdk/aapt.py
diff --git a/build/android/devil/android/sdk/aapt.py b/build/android/devil/android/sdk/aapt.py
index 1c051e0c55fbe3f232891ef1ecc26d26fcbe892f..c2efb50f682cec27a0be774304003747665741b4 100644
--- a/build/android/devil/android/sdk/aapt.py
+++ b/build/android/devil/android/sdk/aapt.py
@@ -6,10 +6,9 @@
 
 import os
 
+from devil import devil_env
 from devil.utils import cmd_helper
-from pylib import constants
 
-_AAPT_PATH = os.path.join(constants.ANDROID_SDK_TOOLS, 'aapt')
 
 def _RunAaptCmd(args):
   """Runs an aapt command.
@@ -20,13 +19,16 @@ def _RunAaptCmd(args):
   Returns:
     The output of the command.
   """
-  cmd = [_AAPT_PATH] + args
+  aapt_path = os.path.join(
+      devil_env.config.android_sdk_build_tools_path, 'aapt')
+  cmd = [aapt_path] + args
   status, output = cmd_helper.GetCmdStatusAndOutput(cmd)
   if status != 0:
     raise Exception('Failed running aapt command: "%s" with output "%s".' %
                     (' '.join(cmd), output))
   return output
 
+
 def Dump(what, apk, assets=None):
   """Returns the output of the aapt dump command.