Make aapt and aidl paths flexible.

build/java.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 Java in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my-package_java',
@@ skipping 158 matching lines @@
             '>@(resource_input_paths)',
             '>@(dependencies_res_zip_paths)',
             '>(inputs_list_file)',
           ],
           'outputs': [
             '<(resource_zip_path)',
           ],
           'action': [
             'python', '<(DEPTH)/build/android/gyp/process_resources.py',
             '--android-sdk', '<(android_sdk)',
-            '--android-sdk-tools', '<(android_sdk_tools)',
+            '--aapt-path', '<(android_aapt_path)',
             '--non-constant-id',
 
             '--android-manifest', '<(android_manifest)',
             '--custom-package', '<(R_package)',
 
             '--dependencies-res-zips', '>(dependencies_res_zip_paths)',
             '--resource-dirs', '<(res_input_dirs)',
 
             '--R-dir', '<(R_dir)',
             '--resource-zip-out', '<(resource_zip_path)',
@@ skipping 148 matching lines @@
             'dex_no_locals': 1,
           }],
         ],
         'dex_input_paths': [ '<(jar_final_path)' ],
         'output_path': '<(dex_path)',
       },
       'includes': [ 'android/dex_action.gypi' ],
     },
   ],
 }