Reland of Android: Run lint using a cache in the output directory (fix-up)

build/android/android_lint_cache.gyp

Index: build/android/android_lint_cache.gyp
diff --git a/build/android/android_lint_cache.gyp b/build/android/android_lint_cache.gyp
index a8b514eca0f881bb99babdd07325c14483f24bf4..8c5175de2e6c799ce4d61df31f7d24c55dc55760 100644
--- a/build/android/android_lint_cache.gyp
+++ b/build/android/android_lint_cache.gyp
@@ -17,26 +17,29 @@
           'variables': {
             'android_lint_cache_stamp': '<(PRODUCT_DIR)/android_lint_cache/android_lint_cache.stamp',
             'android_manifest_path': '<(DEPTH)/build/android/AndroidManifest.xml',
-            'cache_file': '<(PRODUCT_DIR)/android_lint_cache/.android/cache/api-versions-6-23.0.1.bin',
             'result_path': '<(PRODUCT_DIR)/android_lint_cache/result.xml',
+            'platform_xml_path': '<(android_sdk_root)/platform-tools/api/api-versions.xml',
           },
           'inputs': [
+            '<(DEPTH)/build/android/gyp/util/build_utils.py',
             '<(DEPTH)/build/android/gyp/lint.py',
             '<(android_manifest_path)',
+            '<(platform_xml_path)',
           ],
           'outputs': [
-            '<(cache_file)',
+            '<(android_lint_cache_stamp)',
             '<(result_path)',
           ],
           'action': [
             'python', '<(DEPTH)/build/android/gyp/lint.py',
             '--lint-path', '<(android_sdk_root)/tools/lint',
             '--cache-dir', '<(PRODUCT_DIR)/android_lint_cache',
-            '--build-tools-version', '<(android_sdk_build_tools_version)',
+            '--platform-xml-path', '<(platform_xml_path)',
             '--manifest-path', '<(android_manifest_path)',
             '--product-dir', '<(PRODUCT_DIR)',
             '--result-path', '<(result_path)',
             '--stamp', '<(android_lint_cache_stamp)',
+            '--create-cache',
             '--silent',
             '--enable'
           ],