DO NOT MERGE: Revert "Update makefile for clang host build."

This CL is somehow merged to lmp-dev and breaking Mac builds.

This reverts commit 132ed0f2b45acf982bbd06616f14164b612661d1.

Change-Id: I5a3472c0e2924db5c605340d7abdd407b956dcc2
diff --git a/tools/obbtool/Android.mk b/tools/obbtool/Android.mk
index 99a5671..9ff56d6 100644
--- a/tools/obbtool/Android.mk
+++ b/tools/obbtool/Android.mk
@@ -13,7 +13,7 @@
 LOCAL_SRC_FILES := \
 	Main.cpp
 
-LOCAL_CFLAGS := -Wall -Werror -Wno-mismatched-tags
+LOCAL_CFLAGS := -Wall -Werror
 
 #LOCAL_C_INCLUDES +=
 
@@ -36,7 +36,7 @@
 
 LOCAL_MODULE := pbkdf2gen
 LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS := -Wall -Werror -Wno-mismatched-tags
+LOCAL_CFLAGS := -Wall -Werror
 LOCAL_SRC_FILES := pbkdf2gen.cpp
 LOCAL_LDLIBS += -ldl
 LOCAL_C_INCLUDES := external/openssl/include $(LOCAL_C_INCLUDES)