Snap for 4531101 from 2c1559041d5d30bf4e1d622b2c6924facf2a4daf to pi-release

Change-Id: Ief2ac139c4cb18cf834d486aa82a5cc13a1bcf0c
diff --git a/Android.mk b/Android.mk
index d69d983..217c528 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,6 +20,7 @@
 LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/common/inc
 
 LOCAL_CFLAGS := $(keymaster-def)
+LOCAL_CFLAGS += -Wno-error
 
 LOCAL_SHARED_LIBRARIES := \
         libcrypto \