Roll Android SDK to N-MR1

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) {
   import("//build_overrides/build.gni")
 
   has_chrome_android_internal =
@@ skipping 25 matching lines @@
     default_android_ndk_root = "//third_party/android_tools/ndk"
     default_android_ndk_version = "r12b"
     default_android_ndk_major_version = 12
   } else {
     assert(defined(default_android_ndk_version))
     assert(defined(default_android_ndk_major_version))
   }
 
   if (!defined(default_android_sdk_root)) {
     default_android_sdk_root = "//third_party/android_tools/sdk"
-    default_android_sdk_version = "24"
-    default_android_sdk_build_tools_version = "24.0.2"
+    default_android_sdk_version = "25"
+    default_android_sdk_build_tools_version = "25.0.2"
   }
 
   if (!defined(default_lint_android_sdk_root)) {
     # Purposefully repeated so that downstream can change
     # default_android_sdk_root without changing lint version.
     default_lint_android_sdk_root = "//third_party/android_tools/sdk"
-    default_lint_android_sdk_version = "24"
+    default_lint_android_sdk_version = "25"
   }
 
   if (!defined(default_extras_android_sdk_root)) {
     # Purposefully repeated so that downstream can change
     # default_android_sdk_root without changing where we load the SDK extras
     # from. (Google Play services, etc.)
     default_extras_android_sdk_root = "//third_party/android_tools/sdk"
   }
 
   if (!defined(default_android_keystore_path)) {
@@ skipping 300 matching lines @@
           "//build/toolchain/android: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
 }