Re-enable warnings as errors.

Change-Id: I0a512eea437e38759a53e0cafec13b8157bf86a5
diff --git a/Android.mk b/Android.mk
index c9a0b3b..90edc7d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,7 @@
 
 ifneq ($(TARGET_SIMULATOR),true)
 
-local_cflags_for_libbcc := -Wall #-Werror
+local_cflags_for_libbcc := -Wall -Wno-unused-parameter -Werror
 
 LOCAL_PATH := $(call my-dir)
 
@@ -247,7 +247,7 @@
   $(LOCAL_PATH)
 
 # definitions for LLVM
-LOCAL_CFLAGS += -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DDEBUG_CODEGEN=1
+LOCAL_CFLAGS += -DDEBUG_CODEGEN=1
 
 ifeq ($(TARGET_ARCH),arm)
   LOCAL_CFLAGS += -DFORCE_ARM_CODEGEN=1
diff --git a/lib/ExecutionEngine/CacheReader.cpp b/lib/ExecutionEngine/CacheReader.cpp
index 4dd09d3..f748452 100644
--- a/lib/ExecutionEngine/CacheReader.cpp
+++ b/lib/ExecutionEngine/CacheReader.cpp
@@ -193,7 +193,7 @@
     }                                                                       \
                                                                             \
     if (offset % sizeof(int) != 0) {                                        \
-      LOGE(#NAME " offset must aligned to %d.\n", sizeof(int));             \
+      LOGE(#NAME " offset must aligned to %d.\n", (int)sizeof(int));        \
       return false;                                                         \
     }                                                                       \
                                                                             \