Make aapt and aidl paths flexible.

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 750 matching lines @@
         '>(inputs_list_file)',
       ],
       'outputs': [
         '<(resource_zip_path)',
         '<(generated_proguard_file)',
         '<(codegen_stamp)',
       ],
       'action': [
         'python', '<(DEPTH)/build/android/gyp/process_resources.py',
         '--android-sdk', '<(android_sdk)',
-        '--android-sdk-tools', '<(android_sdk_tools)',
+        '--aapt-path', '<(android_aapt_path)',
 
         '--android-manifest', '<(android_manifest_path)',
         '--dependencies-res-zips', '>(dependencies_res_zip_paths)',
 
         '--extra-res-packages', '>(additional_res_packages)',
         '--extra-r-text-files', '>(additional_R_text_files)',
 
         '--proguard-file', '<(generated_proguard_file)',
 
         '--resource-dirs', '<(resource_dir)',
@@ skipping 237 matching lines @@
             'native_libs_dir': '<(apk_package_native_libs_dir)',
           }, {
             'native_libs_dir': '<(DEPTH)/build/android/ant/empty/res',
           }],
         ],
       },
       'includes': ['android/apkbuilder_action.gypi'],
     },
   ],
 }