Merge from jb-mr1-dev-plus-aosp

Change-Id: Ie818c9b62cccc595b1d8538418d5591eb0538722
diff --git a/libgralloc-qsd8k/tests/Android.mk b/libgralloc-qsd8k/tests/Android.mk
index b9a7459..cc662f9 100644
--- a/libgralloc-qsd8k/tests/Android.mk
+++ b/libgralloc-qsd8k/tests/Android.mk
@@ -42,7 +42,6 @@
     $(eval LOCAL_CFLAGS += $(EXTRA_CFLAGS)) \
     $(eval LOCAL_LDLIBS += $(EXTRA_LDLIBS)) \
     $(eval LOCAL_STATIC_LIBRARIES := $(libgralloc_test_static_libs)) \
-    $(eval LOCAL_MODULE_TAGS := eng tests) \
     $(eval include $(BUILD_HOST_EXECUTABLE)) \
   ) \
   $(eval EXTRA_CFLAGS :=) \