diff --git a/libhwcomposer/Android.mk b/libhwcomposer/Android.mk
index 71ebf63..7c5e98f 100644
--- a/libhwcomposer/Android.mk
+++ b/libhwcomposer/Android.mk
@@ -26,5 +26,5 @@ endif
 ifeq ($(TARGET_USE_HDMI_AS_PRIMARY),true)
 #LOCAL_CFLAGS += -DHDMI_AS_PRIMARY
 endif
-LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_TAGS := optional
 include $(BUILD_SHARED_LIBRARY)
diff --git a/liboverlay/Android.mk b/liboverlay/Android.mk
index 62c302f..c90b8f3 100755
--- a/liboverlay/Android.mk
+++ b/liboverlay/Android.mk
@@ -31,5 +31,5 @@ ifeq ($(TARGET_USE_HDMI_AS_PRIMARY),true)
 LOCAL_CFLAGS += -DHDMI_AS_PRIMARY
 endif
 LOCAL_MODULE := liboverlay
-LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_TAGS := optional
 include $(BUILD_SHARED_LIBRARY)