Merge sc-dev-plus-aosp-without-vendor@7634622

Merged-In: If889d37eb0a4a280e5a371a10cd9d01e526a06d2
Change-Id: I48d9475f853956c601a8a88adf01e5f4ee67c1fe
diff --git a/gpu_tonemapper/Android.mk b/gpu_tonemapper/Android.mk
index 0e999b8..845cc5f 100644
--- a/gpu_tonemapper/Android.mk
+++ b/gpu_tonemapper/Android.mk
@@ -19,7 +19,8 @@
 LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
 
 LOCAL_CFLAGS              := $(version_flag) -Wno-missing-field-initializers -Wall \
-                             -Wno-unused-parameter -DLOG_TAG=\"GPU_TONEMAPPER\"
+                             -Wno-unused-parameter -Wno-unreachable-code-loop-increment \
+                             -DLOG_TAG=\"GPU_TONEMAPPER\"
 
 LOCAL_SRC_FILES           := TonemapFactory.cpp \
                              glengine.cpp \