diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index d5d270c..34ed95e 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -25,6 +25,8 @@ TARGET_2ND_CPU_VARIANT := generic
 TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a75
 
 # Audio
+$(call soong_config_set, android_hardware_audio, run_64bit, true)
+
 AUDIO_FEATURE_ENABLED_DLKM := true
 AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true
 AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true
diff --git a/common.mk b/common.mk
index 17da3ab..55cfe7c 100644
--- a/common.mk
+++ b/common.mk
@@ -20,11 +20,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk)
 $(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk)
 
 # Audio
-SOONG_CONFIG_NAMESPACES += android_hardware_audio
-SOONG_CONFIG_android_hardware_audio += \
-    run_64bit
-SOONG_CONFIG_android_hardware_audio_run_64bit := true
-
 PRODUCT_PACKAGES += \
     android.hardware.audio@7.1-impl.samsung-sm8550 \
     android.hardware.audio.effect@7.0-impl \