release-request-01b39c26-bf86-40a5-a7bf-8eb15c488673-for-git_oc-mr1-release-4080221 snap-temp-L23400000072087081

Change-Id: Ie38f11aae60dda262fb74de1e25412482b129ae5
diff --git a/lib/SPIRV/Android.bp b/lib/SPIRV/Android.bp
index 7936dab..30394d8 100644
--- a/lib/SPIRV/Android.bp
+++ b/lib/SPIRV/Android.bp
@@ -101,6 +101,11 @@
         "-Wno-unused-parameter",
     ],
 
+    clang_cflags: [
+        // Temporarily suppress the warnings http://b/37867503
+        "-Wno-error=user-defined-warnings",
+    ],
+
     product_variables: {
         unbundled_build: {
             // Don't build for unbundled branches