diff --git a/libdw/Android.mk b/libdw/Android.mk
index 9f4708d..0723045 100755
--- a/libdw/Android.mk
+++ b/libdw/Android.mk
@@ -139,7 +139,7 @@
 # to fix machine-dependent issues
 LOCAL_CFLAGS += -include $(LOCAL_PATH)/../host-$(HOST_OS)-fixup/AndroidFixup.h
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_TAGS := eng
 
 LOCAL_MODULE:= libdw
 
@@ -172,7 +172,7 @@
 # to suppress the "pointer of type ‘void *’ used in arithmetic" warning
 LOCAL_CFLAGS += -Wno-pointer-arith
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_TAGS := eng
 
 LOCAL_MODULE:= libdw
 
diff --git a/libdwfl/Android.mk b/libdwfl/Android.mk
index 3effccc..ce8dddb 100755
--- a/libdwfl/Android.mk
+++ b/libdwfl/Android.mk
@@ -66,7 +66,7 @@
 # to fix machine-dependent issues
 LOCAL_CFLAGS += -include $(LOCAL_PATH)/../host-$(HOST_OS)-fixup/AndroidFixup.h
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_TAGS := eng
 
 LOCAL_MODULE:= libdwfl
 
@@ -98,7 +98,7 @@
 # to suppress the "pointer of type ‘void *’ used in arithmetic" warning
 LOCAL_CFLAGS += -Wno-pointer-arith
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_TAGS := eng
 
 LOCAL_MODULE:= libdwfl
 
diff --git a/libebl/Android.mk b/libebl/Android.mk
index 19b0d68..dd9985e 100755
--- a/libebl/Android.mk
+++ b/libebl/Android.mk
@@ -86,7 +86,7 @@
 
 LOCAL_CFLAGS += -include $(LOCAL_PATH)/../host-$(HOST_OS)-fixup/AndroidFixup.h
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_TAGS := eng
 
 LOCAL_MODULE:= libebl
 
@@ -114,7 +114,7 @@
 
 LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -Werror
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_TAGS := eng
 
 LOCAL_MODULE:= libebl
 
diff --git a/libelf/Android.mk b/libelf/Android.mk
index 78233d0..281dd64 100755
--- a/libelf/Android.mk
+++ b/libelf/Android.mk
@@ -184,7 +184,7 @@
 
 LOCAL_CFLAGS += -include $(LOCAL_PATH)/../bionic-fixup/AndroidFixup.h
 
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_TAGS := eng
 
 LOCAL_MODULE := libelf