diff --git a/Android.bp b/Android.bp
index 2955ff9..51b3612 100644
--- a/Android.bp
+++ b/Android.bp
@@ -43,12 +43,6 @@
         "-std=c++11",
     ],
 
-    clang_cflags: [
-        // Temporarily suppress the warnings http://b/37867503
-        "-Wno-error=unused-lambda-capture",
-        "-Wno-error=user-defined-warnings",
-    ],
-
     tidy_checks: [
         "-google-build-*",
         "-google-global-*",
diff --git a/lib/Transforms/Vectorize/Android.bp b/lib/Transforms/Vectorize/Android.bp
index 78b1685..a929552 100644
--- a/lib/Transforms/Vectorize/Android.bp
+++ b/lib/Transforms/Vectorize/Android.bp
@@ -4,4 +4,7 @@
         "llvm-lib-defaults",
     ],
     srcs: ["*.cpp"],
+    clang_cflags: [
+        "-Wno-user-defined-warnings",
+    ],
 }
diff --git a/utils/TableGen/Android.bp b/utils/TableGen/Android.bp
index fc80743..3c7e993 100644
--- a/utils/TableGen/Android.bp
+++ b/utils/TableGen/Android.bp
@@ -4,10 +4,12 @@
     srcs: ["*.cpp"],
 
     static_libs: [
-        "libLLVMTableGen",
         "libLLVMSupport",
+        "libLLVMTableGen",
     ],
-
+    clang_cflags: [
+        "-Wno-user-defined-warnings",
+    ],
     target: {
         windows: {
             enabled: false,