Merge commit '2a8334bd8216d27c3eb141538cc57c06caa2c038' into HEAD

Change-Id: I7d91bc8df0ee0716eeffe0daaff755d85f8327ae
diff --git a/videocodec/Android.mk b/videocodec/Android.mk
index 438a238..89779cc 100755
--- a/videocodec/Android.mk
+++ b/videocodec/Android.mk
@@ -511,7 +511,7 @@
 endif
 
 # TODO: Fix this.
-LOCAL_CFLAGS += -Wno-error=unused-variable
+LOCAL_CFLAGS += -Wall -Werror -Wno-error=unused-variable
 
 include $(BUILD_SHARED_LIBRARY)
 endif