android: Don't require aapt to be on the path during builds and tests.

build/android/adb_install_apk.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 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.
 
 """Utility script to install APKs from the command line quickly."""
 
 import multiprocessing
 import optparse
@@ skipping 45 matching lines @@
   constants.SetBuildType(options.build_type)
   ValidateInstallAPKOption(parser, options)
   if len(args) > 1:
     raise Exception('Error: Unknown argument:', args[1:])
 
   devices = android_commands.GetAttachedDevices()
   if not devices:
     raise Exception('Error: no connected devices')
 
   if not options.apk_package:
-    options.apk_package = apk_helper.GetPackageName(options.apk)
+    options.apk_package = apk_helper.GetPackageName(constants.ANDROID_SDK_TOOLS,
+                                                    options.apk)
 
   pool = multiprocessing.Pool(len(devices))
   # Send a tuple (apk_path, apk_package, device) per device.
   pool.map(_InstallApk, zip([options.apk] * len(devices),
                             [options.apk_package] * len(devices),
                             [options.keep_data] * len(devices),
                             devices))
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))