diff --git a/core/package.mk b/core/package.mk
index 559a3d9..f678b3c 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -31,6 +31,8 @@
 LOCAL_2ND_ARCH_VAR_PREFIX :=
 endif
 
+LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true
+
 # If this makefile is being read from within an inheritance,
 # use the new values.
 skip_definition:=
@@ -474,4 +476,6 @@
 # Reset internal variables.
 all_res_assets :=
 
+LOCAL_NO_2ND_ARCH_MODULE_SUFFIX :=
+
 LOCAL_2ND_ARCH_VAR_PREFIX :=