diff --git a/core/host_shared_library.mk b/core/host_shared_library.mk
index 438a9ce3d..ae596df2d 100644
--- a/core/host_shared_library.mk
+++ b/core/host_shared_library.mk
@@ -12,6 +12,10 @@ endif
 endif
 endif
 
+ifneq ($(my_module_multilib),both)
+LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true
+endif
+
 LOCAL_2ND_ARCH_VAR_PREFIX :=
 include $(BUILD_SYSTEM)/module_arch_supported.mk
 
@@ -34,6 +38,7 @@ endif
 LOCAL_2ND_ARCH_VAR_PREFIX :=
 endif  # HOST_2ND_ARCH
 
+LOCAL_NO_2ND_ARCH_MODULE_SUFFIX :=
 my_module_arch_supported :=
 
 ###########################################################
diff --git a/core/host_static_library.mk b/core/host_static_library.mk
index 74ac2ea66..dc22c08b4 100644
--- a/core/host_static_library.mk
+++ b/core/host_static_library.mk
@@ -12,6 +12,10 @@ endif
 endif
 endif
 
+ifneq ($(my_module_multilib),both)
+LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true
+endif
+
 LOCAL_2ND_ARCH_VAR_PREFIX :=
 include $(BUILD_SYSTEM)/module_arch_supported.mk
 
@@ -34,6 +38,7 @@ endif
 LOCAL_2ND_ARCH_VAR_PREFIX :=
 endif  # HOST_2ND_ARCH
 
+LOCAL_NO_2ND_ARCH_MODULE_SUFFIX :=
 my_module_arch_supported :=
 
 ###########################################################