diff --git a/src/base/BUILD.gn b/src/base/BUILD.gn
index 7e0cb7efb8..c4daf1d24d 100644
--- a/src/base/BUILD.gn
+++ b/src/base/BUILD.gn
@@ -1388,7 +1388,7 @@ component("base") {
   # building inside the cros_sdk environment - use host_toolchain as a
   # more robust check for this.
   if (!use_sysroot &&
-      (is_android || ((is_linux || is_chromeos) && !is_chromecast)) &&
+      ((is_linux || is_chromeos) && !is_chromecast) &&
       host_toolchain != "//build/toolchain/cros:host") {
     libs += [ "atomic" ]
   }
diff --git a/src/buildtools/third_party/libc++abi/BUILD.gn b/src/buildtools/third_party/libc++abi/BUILD.gn
index 6b83828907..9183fab178 100644
--- a/src/buildtools/third_party/libc++abi/BUILD.gn
+++ b/src/buildtools/third_party/libc++abi/BUILD.gn
@@ -109,4 +109,15 @@ source_set("libc++abi") {
       "//build/config/compiler:no_rtti",
     ]
   }
+  if (is_android) {
+    sources += [
+      "trunk/src/private_typeinfo.cpp",
+    ]
+    configs -= [
+      "//build/config/compiler:no_rtti",
+    ]
+    configs += [
+      "//build/config/compiler:rtti",
+    ]
+  }
 }
diff --git a/src/get-clang.sh b/src/get-clang.sh
index 5d7eb66055..369d34152a 100755
--- a/src/get-clang.sh
+++ b/src/get-clang.sh
@@ -61,6 +61,6 @@ if [ "$USE_ANDROID_NDK" -a ! -d third_party/android_ndk ]; then
   git -c advice.detachedHead=false checkout "$android_ndk_version"
   rm -rf .git
   find toolchains -type f -regextype egrep \! -regex \
-    '.*(lib(atomic|gcc|gcc_real|compiler_rt-extras|android_support|unwind).a|crt.*o|lib(android|c|dl|log|m).so|usr/local.*|usr/include.*)' -delete
+    '.*(crt.*o|lib(android|c|dl|log|m).so|usr/local.*|usr/include.*)' -delete
   cd ../..
 fi