Revert "Don't rename host libraries if only one arch is build."

This reverts commit b1f7fb7a508bb6b093c8b37d65adc9a5a0836e6e.

Change-Id: Id7ea4803ab52659c1316ea9f1babf8117b667441
diff --git a/core/host_shared_library.mk b/core/host_shared_library.mk
index ae596df..438a9ce 100644
--- a/core/host_shared_library.mk
+++ b/core/host_shared_library.mk
@@ -12,10 +12,6 @@
 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
 
@@ -38,7 +34,6 @@
 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 dc22c08..74ac2ea 100644
--- a/core/host_static_library.mk
+++ b/core/host_static_library.mk
@@ -12,10 +12,6 @@
 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
 
@@ -38,7 +34,6 @@
 LOCAL_2ND_ARCH_VAR_PREFIX :=
 endif  # HOST_2ND_ARCH
 
-LOCAL_NO_2ND_ARCH_MODULE_SUFFIX :=
 my_module_arch_supported :=
 
 ###########################################################