Remove lint variables from SDK version and path.

build/config/android/config.gni

 # Copyright 2014 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 contains common system config stuff for the Android build.
 
 if (is_android) {
   assert(rebase_path("//", root_build_dir) == "../../",
          "Android output directory must be nested 2 levels within src/ (" +
              "e.g.: out-gn/Debug). http://crbug.com/412935")
@@ skipping 14 matching lines @@
   }
 
   if (!defined(default_android_ndk_root)) {
     default_android_ndk_major_version = "10"
     default_android_ndk_root = "//third_party/android_tools/ndk"
     default_android_ndk_version = "r10e"
   } else {
     assert(defined(default_android_ndk_version))
   }
 
-  # The same version of lint should be used for building all targets,
-  # and these args ensure that the upstream version of lint is used for
-  # both upstream and downstream targets.
-  lint_android_sdk_root = "//third_party/android_tools/sdk"
-  lint_android_sdk_version = "23"
+  if (!defined(default_android_sdk_root)) {
+    default_android_sdk_root = "//third_party/android_tools/sdk"
+    default_android_sdk_version = "23"
+    default_android_sdk_build_tools_version = "23.0.1"
+  }
 
-  if (!defined(default_android_sdk_root)) {
-    # Reuse the lint variables to ensure that the lint version gets updated
-    # when the upstream SDK version is updated.
-    default_android_sdk_root = lint_android_sdk_root
-    default_android_sdk_version = lint_android_sdk_version
-    default_android_sdk_build_tools_version = "23.0.1"
+  if (!defined(default_lint_android_sdk_root)) {
+    default_lint_android_sdk_root = default_android_sdk_root
+    default_lint_android_sdk_version = default_android_sdk_version
   }
 
   if (!defined(default_android_keystore_path)) {
     default_android_keystore_path =
         "//build/android/ant/chromium-debug.keystore"
     default_android_keystore_name = "chromiumdebugkey"
     default_android_keystore_password = "chromium"
   }
 
   if (!defined(google_play_services_library)) {
@@ skipping 14 matching lines @@
 
   declare_args() {
     android_ndk_major_version = default_android_ndk_major_version
     android_ndk_root = default_android_ndk_root
     android_ndk_version = default_android_ndk_version
 
     android_sdk_root = default_android_sdk_root
     android_sdk_version = default_android_sdk_version
     android_sdk_build_tools_version = default_android_sdk_build_tools_version
 
+    lint_android_sdk_root = default_lint_android_sdk_root
+    lint_android_sdk_version = default_lint_android_sdk_version
+
     # Libc++ library directory. Override to use a custom libc++ binary.
     android_libcpp_lib_dir = ""
 
     # Android versionCode for android_apk()s that don't expclitly set one.
     android_default_version_code = "1"
 
     # Android versionName for android_apk()s that don't expclitly set one.
     android_default_version_name = "Developer Build"
 
     # The path to the keystore to use for signing builds.
@@ skipping 231 matching lines @@
           "//build/toolchain/android:${android_secondary_abi_cpu}"
     }
   }
 }
 
 declare_args() {
   # Enables used resource whitelist generation. Set for official builds only
   # as a large amount of build output is generated.
   enable_resource_whitelist_generation = is_android && is_official_build
 }