diff --git a/BoardConfig.mk b/BoardConfig.mk
index b50cb76..6e64cc7 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -89,7 +89,7 @@ AUDIO_FEATURE_ENABLED_SSR := true
 AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true
 BOARD_SUPPORTS_OPENSOURCE_STHAL := true
 BOARD_SUPPORTS_SOUND_TRIGGER := true
-BOARD_USES_ALSA_AUDIO := true
+TARGET_PROVIDES_AUDIO_EXTNS := true
 
 # Display
 SOONG_CONFIG_qtidisplay_udfps := true
diff --git a/device.mk b/device.mk
index 282df55..a0bae8b 100644
--- a/device.mk
+++ b/device.mk
@@ -125,29 +125,19 @@ PRODUCT_PACKAGES += \
     android.hardware.bluetooth.audio@2.1-impl \
     android.hardware.soundtrigger@2.3-impl \
     audio.bluetooth.default \
-    audio.primary.lahaina \
     audio.r_submix.default \
     audio.usb.default \
     audioadsprpcd \
-    liba2dpoffload \
     libaudiopreprocessing \
-    libbatterylistener \
     libbundlewrapper \
-    libcomprcapture \
     libdownmix \
     libdynproc \
     libeffectproxy \
-    libexthwplugin \
-    libhdmiedid \
-    libhfp \
     libldnhncr \
     libqcompostprocbundle \
     libqcomvisualizer \
     libqcomvoiceprocessing \
     libreverbwrapper \
-    libsndmonitor \
-    libspkrprot \
-    libssrec \
     libtinycompress \
     libvisualizer \
     libvolumelistener \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 4c466ef..ab1ebb6 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -98,20 +98,27 @@ vendor/lib/hw/com.dsi.ant@1.0-impl.so
 vendor/lib64/hw/com.dsi.ant@1.0-impl.so
 
 # Audio
-vendor/lib/hw/audio.primary.lahaina.so;MODULE_SUFFIX=_Spacewar;OVERRIDES=audio.primary.lahaina
+vendor/lib/hw/audio.primary.lahaina.so
 vendor/lib/lib_lvacfs.so
-vendor/lib/liba2dpoffload.so;MODULE_SUFFIX=_Spacewar;OVERRIDES=liba2dpoffload
+vendor/lib/liba2dpoffload.so
 vendor/lib/libadiertac.so
 vendor/lib/libadm.so
 vendor/lib/libaudcal.so
 vendor/lib/libaudio_log_utils.so
 vendor/lib/libaudioconfigstore.so
 vendor/lib/libaudioparsers.so
+vendor/lib/libbatterylistener.so
+vendor/lib/libcomprcapture.so
 vendor/lib/libdrc.so
+vendor/lib/libexthwplugin.so
+vendor/lib/libhdmiedid.so
 vendor/lib/libhdmipassthru.so
 vendor/lib/liblvacfs_wrapper.so
+vendor/lib/libhfp.so
 vendor/lib/libqtigef.so
-vendor/lib/libssrec.so;MODULE_SUFFIX=_Spacewar;OVERRIDES=libssrec
+vendor/lib/libsndmonitor.so
+vendor/lib/libspkrprot.so
+vendor/lib/libssrec.so
 vendor/lib/libsurround_3mic_proc.so
 vendor/lib64/libaudcal.so
 vendor/lib64/libadiertac.so