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

build/android/pylib/linker/test_runner.py

 # Copyright 2013 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.
 
 """Runs linker tests on a particular device."""
 
 import logging
 import os.path
 import sys
 import time
@@ skipping 54 matching lines @@
                                                cleanup_test_files)
 
   #override
   def InstallTestPackage(self):
     apk_path = os.path.join(
         constants.GetOutDirectory(), 'apks', '%s.apk' % _PACKAGE_NAME)
 
     if not os.path.exists(apk_path):
       raise Exception('%s not found, please build it' % apk_path)
 
-    package_name = apk_helper.GetPackageName(apk_path)
+    package_name = apk_helper.GetPackageName(constants.ANDROID_SDK_TOOLS,
+                                             apk_path)
     self.adb.ManagedInstall(apk_path, package_name)
 
   #override
   def RunTest(self, test):
     """Sets up and runs a test case.
 
     Args:
       test: An object which is ostensibly a subclass of LinkerTestCaseBase.
 
     Returns:
@@ skipping 10 matching lines @@
                         test.tagged_name)
       exc_info = sys.exc_info()
       results = base_test_result.TestRunResults()
       results.AddResult(LinkerExceptionTestResult(
           test.tagged_name, exc_info))
 
     if not results.DidRunPass():
       return results, test
     else:
       return results, None