Merge commit '24e0859a94c9ffd3bc1ec84e1f18e2d505eb2722' into HEAD

Change-Id: I8c974b487bb02d75a33df4a69d6d5c948ba0bef2
diff --git a/Android.mk b/Android.mk
index f2f18cb..482194c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -159,6 +159,8 @@
 	mojo/public/cpp/system/watcher.cc \
 
 LOCAL_CFLAGS := \
+	-Wall \
+	-Werror \
 	-Wno-unused-parameter \
 	-Wno-missing-field-initializers \
 	-DMOJO_EDK_LEGACY_PROTOCOL \