Make aapt and aidl paths flexible.

build/android/package_resources_action.gypi

 # Copyright 2015 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 a helper to java_apk.gypi. It should be used to create an
 # action that runs ApkBuilder via ANT.
 #
 # Required variables:
 #  apk_name - File name (minus path & extension) of the output apk.
 #  android_manifest_path - Path to AndroidManifest.xml.
@@ skipping 27 matching lines @@
     '<(DEPTH)/build/android/gyp/package_resources.py',
     '<(android_manifest_path)',
     '<@(extra_inputs)',
   ],
   'outputs': [
     '<(resource_packaged_apk_path)',
   ],
   'action': [
     'python', '<(DEPTH)/build/android/gyp/package_resources.py',
     '--android-sdk', '<(android_sdk)',
-    '--android-sdk-tools', '<(android_sdk_tools)',
+    '--aapt-path', '<(android_aapt_path)',
     '--configuration-name', '<(CONFIGURATION_NAME)',
     '--android-manifest', '<(android_manifest_path)',
     '--version-code', '<(app_manifest_version_code)',
     '--version-name', '<(app_manifest_version_name)',
     '--no-compress', '<(extensions_to_not_compress)',
     '--apk-path', '<(resource_packaged_apk_path)',
   ],
   'conditions': [
     ['shared_resources == 1', {
       'action': [
@@ skipping 19 matching lines @@
     ['resource_zips != []', {
       'action': [
         '--resource-zips', '>(resource_zips)',
       ],
       'inputs': [
         '>@(resource_zips)',
       ],
     }],
   ],
 }