Remove lint variables from SDK version and path.

build/config/android/config.gni

Index: build/config/android/config.gni
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index b658069a34895f6c3b316f17c5c268c0cb44fa29..764e5f0ecac3d40f8500a2c2a5f429d7ad61f691 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -32,20 +32,17 @@ if (is_android) {
     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)) {
-    # 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_root = "//third_party/android_tools/sdk"
+    default_android_sdk_version = "23"
     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"
@@ -78,6 +75,9 @@ if (is_android) {
     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 = ""