release-request-97deec33-9c52-4210-b9f0-ef473887084a-for-git_oc-dr1-release-4075621 snap-temp-L51200000071372001

Change-Id: Idec61a85f73c83e533c4d43fd0656fb2f07711cd
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