diff --git a/common.gypi b/common.gypi
index f35a100da..99adeb0b2 100644
--- a/common.gypi
+++ b/common.gypi
@@ -3886,16 +3886,6 @@
               '-std=gnu++11',
             ],
           }],
-          ['clang==1 and OS=="android"', {
-            # Android uses stlport, whose include/new defines
-            # `void  operator delete[](void* ptr) throw();`, which
-            # clang's -Wimplicit-exception-spec-mismatch warns about for some
-            # reason -- http://llvm.org/PR16638. TODO(thakis): Include stlport
-            # via -isystem instead.
-            'cflags_cc': [
-              '-Wno-implicit-exception-spec-mismatch',
-            ],
-          }],
           ['clang==1 and clang_use_chrome_plugins==1', {
             'cflags': [
               '<@(clang_chrome_plugins_flags)',
@@ -4525,7 +4515,7 @@
                 ],
               }, { # else: use_system_stlport!=1
                 'cflags': [
-                  '-I<(android_stlport_include)',
+                  '-isystem<(android_stlport_include)',
                 ],
                 'ldflags': [
                   '-L<(android_stlport_libs_dir)',
diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn
index 42f603543..aa66b894a 100644
--- a/config/compiler/BUILD.gn
+++ b/config/compiler/BUILD.gn
@@ -400,7 +400,8 @@ config("runtime_library") {
       android_stlport_root = "$android_ndk_root/sources/cxx-stl/stlport"
 
       cflags += [
-        "-I" + rebase_path("$android_stlport_root/stlport", root_build_dir)
+        "-isystem" + rebase_path("$android_stlport_root/stlport",
+                                 root_build_dir)
       ]
       lib_dirs += [ "$android_stlport_root/libs/$android_app_abi" ]