Revert of [Reland] Upgrade to new Android SDK.

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 410 matching lines @@
 
     # gRPC, an RPC framework. For Blimp use only.
     'src/third_party/grpc':
       Var('chromium_git') + '/external/github.com/grpc/grpc' + '@' + '3f186a41daa7c951234ea98cfaa50996047a47fd',
   },
   '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' + '@' + '3d6ba29a6693bf3db1343fc213eea47c7d940413',
+      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 577 matching lines @@
 ]
 
 recursedeps = [
   # buildtools provides clang_format, libc++, and libc++abi
   'src/buildtools',
   # 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"),
 ]