Merge commit '25fa4bc81f75b6e85bc2a5600a8bb6d4fad118ad' into HEAD

Change-Id: I46ab56491397f1bea0d12607bebccba02017f306
diff --git a/ituxd/jni/Android.mk b/ituxd/jni/Android.mk
index 65130f7..924bc85 100644
--- a/ituxd/jni/Android.mk
+++ b/ituxd/jni/Android.mk
@@ -27,6 +27,7 @@
 LOCAL_SRC_FILES:= thermalJNI.cpp \
     onload.cpp
 
+LOCAL_CFLAGS += -Wall -Werror
 
 LOCAL_SHARED_LIBRARIES := \
     libbinder \