[Android] Roll to NDK r12b.

DEPS

 # This file is used to manage the dependencies of the Chromium src repo. It is
 # used by gclient to determine what version of each dependency to check out, and
 # where.
 #
 # For more information, please refer to the official documentation:
 #   https://sites.google.com/a/chromium.org/dev/developers/how-tos/get-the-code
 #
 # When adding a new dependency, please update the top-level .gitignore file
 # to list the dependency's destination directory.
 #
@@ skipping 411 matching lines @@
 
     # gRPC, an RPC framework. For Blimp use only.
     'src/third_party/grpc':
      Var('chromium_git') + '/external/github.com/grpc/grpc' + '@' + 'dc44fe515c8c30093ea8b2f14230123959c886e8',
   },
   'android': {
     'src/third_party/android_protobuf/src':
      Var('chromium_git') + '/external/android_protobuf.git' + '@' + '999188d0dc72e97f7fe08bb756958a2cf090f4e7',
 
     'src/third_party/android_tools':
-     Var('chromium_git') + '/android_tools.git' + '@' + 'af1c5a4cd6329ccdcf8c2bc93d9eea02f9d74869',
+     Var('chromium_git') + '/android_tools.git' + '@' + '25d57ead05d3dfef26e9c19b13ed10b0a69829cf',
 
     'src/third_party/apache-mime4j':
      Var('chromium_git') + '/chromium/deps/apache-mime4j.git' + '@' + '28cb1108bff4b6cf0a2e86ff58b3d025934ebe3a',
 
     'src/third_party/apache-portable-runtime/src':
      Var('chromium_git') + '/external/apache-portable-runtime.git' + '@' + 'c76a8c4277e09a82eaa229e35246edea1ee0a6a1',
 
     'src/third_party/errorprone/lib':
       Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '0eea83b66343133b9c76b7d3288c30321818ebcf',
 
@@ skipping 43 matching lines @@
       Var('chromium_git') + '/external/github.com/kennethreitz/requests.git' + '@' + 'f172b30356d821d180fa4ecfa3e71c7274a32de4',
 
     'src/third_party/custom_tabs_client/src':
       Var('chromium_git') + '/external/github.com/GoogleChrome/custom-tabs-client.git' + '@' + 'c51efbddc4f976c88d15c730a79feba65ca857af',
 
     'src/third_party/gvr-android-sdk/src':
       Var('chromium_git') + '/external/github.com/googlevr/gvr-android-sdk.git' + '@' + 'cff15311c7c1abbe77b3c714135dccc2009ee473',
   },
 }
 
-recursedeps = [ 'src/third_party/android_tools' ]
-
 include_rules = [
   # Everybody can use some things.
   # NOTE: THIS HAS TO STAY IN SYNC WITH third_party/DEPS which disallows these.
   '+base',
   '+build',
   '+ipc',
 
   # Everybody can use headers generated by tools/generate_library_loader.
   '+library_loaders',
 
@@ skipping 510 matching lines @@
     "action": [ "download_from_google_storage",
                 "--no_resume",
                 "--no_auth",
                 "-u",
                 "--bucket", "v8-wasm-asmjs-fuzzer",
                 "-s", "src/v8/test/fuzzer/wasm_asmjs.tar.gz.sha1",
     ],
   },
 ]
 
-# ANGLE manages DEPS that it also owns the build files for, such as dEQP.
-recursedeps = [("src/third_party/angle", "DEPS.chromium")]
+recursedeps = [
+  # android_tools manages the NDK.
+  'src/third_party/android_tools',
+  # ANGLE manages DEPS that it also owns the build files for, such as dEQP.
+  ("src/third_party/angle", "DEPS.chromium"),
+]