Snap for 4396096 from 2edb366074e3c3ce4004f383ef20f598fd19769f to pi-release

Change-Id: I154babd1e6838768347c0607faac1512a6cb9495
diff --git a/Android.mk b/Android.mk
index 534a478..8dec83a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,9 +6,15 @@
 
 LOCAL_C_INCLUDES := external/fsck_msdos/
 
-LOCAL_CFLAGS := -O2 -g -W -Wall -D_BSD_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-
-LOCAL_CFLAGS := -Wno-unused-variable -Wno-unused-const-variable -Wno-format -Wno-sign-compare
+LOCAL_CFLAGS := -O2 -g \
+    -Wall -Werror \
+    -D_BSD_SOURCE \
+    -D_LARGEFILE_SOURCE \
+    -D_FILE_OFFSET_BITS=64 \
+    -Wno-unused-variable \
+    -Wno-unused-const-variable \
+    -Wno-format \
+    -Wno-sign-compare
 
 LOCAL_MODULE := fsck_msdos
 LOCAL_MODULE_TAGS :=