Merge commit 'b2dd6a8ef54b233843b463204ec4e3b67148a7e8' into HEAD

Change-Id: Id7e29d1428552414abd16ac7cd17d86b51e61658
diff --git a/jni/Android.mk b/jni/Android.mk
index dbc0674..cb9a69c 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -27,7 +27,7 @@
 LOCAL_MODULE    := libgiftranscode
 LOCAL_SRC_FILES := GifTranscoder.cpp
 
-LOCAL_CFLAGS += -Wall -Wno-unused-parameter -Wno-switch
+LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter -Wno-switch
 
 LOCAL_SDK_VERSION := 19
 LOCAL_NDK_STL_VARIANT := c++_static # LLVM libc++