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

build/java_apk.gypi

 # 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.
 
 # This file is meant to be included into a target to provide a rule
 # to build Android APKs in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my_package_apk',
@@ skipping 332 matching lines @@
                 '<(DEPTH)/build/android/gyp/create_device_library_links.py',
                 '<(apk_install_record)',
                 '<(build_device_config_path)',
                 '<(ordered_libraries_file)',
               ],
               'outputs': [
                 '<(link_stamp)'
               ],
               'action': [
                 'python', '<(DEPTH)/build/android/gyp/create_device_library_links.py',
+                '--android-sdk-tools=<(android_sdk_tools)',
                 '--build-device-configuration=<(build_device_config_path)',
                 '--libraries-json=<(ordered_libraries_file)',
                 '--script-host-path=<(symlink_script_host_path)',
                 '--script-device-path=<(symlink_script_device_path)',
                 '--target-dir=<(device_library_dir)',
                 '--apk=<(incomplete_apk_path)',
                 '--stamp=<(link_stamp)',
                 '--configuration-name=<(CONFIGURATION_NAME)',
               ],
             },
@@ skipping 78 matching lines @@
             '<(DEPTH)/build/android/gyp/util/build_utils.py',
             '<(DEPTH)/build/android/gyp/apk_install.py',
             '<(build_device_config_path)',
             '<(incomplete_apk_path)',
           ],
           'outputs': [
             '<(apk_install_record)',
           ],
           'action': [
             'python', '<(DEPTH)/build/android/gyp/apk_install.py',
+            '--android_sdk_tools=<(android_sdk_tools)',
             '--apk-path=<(incomplete_apk_path)',
             '--build-device-configuration=<(build_device_config_path)',
             '--install-record=<(apk_install_record)',
             '--configuration-name=<(CONFIGURATION_NAME)',
           ],
         },
       ],
     }],
     ['is_test_apk == 1', {
       'dependencies': [
@@ skipping 306 matching lines @@
         '<(DEPTH)/build/android/ant/apk-package.xml',
 
         # Add list of inputs to the command line, so if inputs change
         # (e.g. if a Java file is removed), the command will be re-run.
         # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
         '-DTHIS_IS_IGNORED=>!(echo \'>(_inputs)\' | md5sum)',
       ]
     },
   ],
 }