diff --git a/android/pylib/constants.py b/android/pylib/constants.py
index f6edfedcc..95b186876 100644
--- a/android/pylib/constants.py
+++ b/android/pylib/constants.py
@@ -162,7 +162,7 @@ class ANDROID_SDK_VERSION_CODES(object):
   LOLLIPOP = 21
 
 ANDROID_SDK_VERSION = ANDROID_SDK_VERSION_CODES.LOLLIPOP
-ANDROID_SDK_BUILD_TOOLS_VERSION = '21.0.0'
+ANDROID_SDK_BUILD_TOOLS_VERSION = '21.0.1'
 ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
                                 'third_party/android_tools/sdk')
 ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,
diff --git a/common.gypi b/common.gypi
index ad0261cf5..708e12c2a 100644
--- a/common.gypi
+++ b/common.gypi
@@ -1652,7 +1652,7 @@
             'android_host_arch%': '<!(uname -m)',
             # Android API-level of the SDK used for compilation.
             'android_sdk_version%': '21',
-            'android_sdk_build_tools_version%': '21.0.0',
+            'android_sdk_build_tools_version%': '21.0.1',
             'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
           },
           # Copy conditionally-set variables out one scope.
@@ -1680,7 +1680,7 @@
             ['target_arch == "x64"', {
               'android_app_abi%': 'x86_64',
               'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86_64/gdbserver/gdbserver',
-              'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-L/arch-x86_64',
+              'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-21/arch-x86_64',
               'android_ndk_lib_dir%': 'usr/lib64',
               'android_toolchain%': '<(android_ndk_root)/toolchains/x86_64-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
             }],
@@ -1700,7 +1700,7 @@
             ['target_arch == "arm64"', {
               'android_app_abi%': 'arm64-v8a',
               'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm64/gdbserver/gdbserver',
-              'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-L/arch-arm64',
+              'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-21/arch-arm64',
               'android_ndk_lib_dir%': 'usr/lib',
               'android_toolchain%': '<(android_ndk_root)/toolchains/aarch64-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
             }],
@@ -1714,7 +1714,7 @@
             ['target_arch == "mips64el"', {
               'android_app_abi%': 'mips64',
               'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-mips64/gdbserver/gdbserver',
-              'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-L/arch-mips64',
+              'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-21/arch-mips64',
               'android_ndk_lib_dir%': 'usr/lib64',
               'android_toolchain%': '<(android_ndk_root)/toolchains/mips64el-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
               'gcc_version%': 49,
diff --git a/config/android/config.gni b/config/android/config.gni
index e602083fc..aa2e71fe2 100644
--- a/config/android/config.gni
+++ b/config/android/config.gni
@@ -14,7 +14,7 @@ if (is_android) {
   } else {
     default_android_sdk_root = "//third_party/android_tools/sdk"
     default_android_sdk_version = "21"
-    default_android_sdk_build_tools_version = "21.0.0"
+    default_android_sdk_build_tools_version = "21.0.1"
   }
 
   declare_args() {
diff --git a/get_landmines.py b/get_landmines.py
index 14170dfc1..f4a9249a3 100755
--- a/get_landmines.py
+++ b/get_landmines.py
@@ -58,6 +58,7 @@ def print_landmines():
   print 'ninja dependency cycle: crbug.com/408192'
   if platform() == 'android':
     print 'Delete stale generated .java files yet again. crbug.com/349592'
+    print 'Clobber to delete incompatible object binary format with NDK r10c'
 
 
 def main():