Merge commit 'fc9ca8ff4910392c06b1d1e3f32d683215375c07' into HEAD

Change-Id: I9f6228fb617fb666413057dcfc77df23daecf337
diff --git a/AK8975_FS/akmdfs/Android.mk b/AK8975_FS/akmdfs/Android.mk
index b01ce63..ba48b7d 100644
--- a/AK8975_FS/akmdfs/Android.mk
+++ b/AK8975_FS/akmdfs/Android.mk
@@ -24,6 +24,8 @@
 
 LOCAL_CFLAGS += \
 	-Wall \
+	-Werror \
+	-Wno-unused-parameter \
 	-DENABLE_AKMDEBUG=1 \
 	-DOUTPUT_STDOUT=1 \
 	-DDBG_LEVEL=2 \
diff --git a/AK8975_FS/libsensors/Android.mk b/AK8975_FS/libsensors/Android.mk
index 4031812..08c742d 100644
--- a/AK8975_FS/libsensors/Android.mk
+++ b/AK8975_FS/libsensors/Android.mk
@@ -27,6 +27,8 @@
 
 LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\" \
 				-Wall \
+				-Werror \
+				-Wno-unused-parameter \
 				-DSENSORHAL_ACC_ADXL346
 #				-DSENSORHAL_ACC_KXTF9