diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index e6cff3670..182959c87 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -199,6 +199,7 @@ PRODUCT_PACKAGES += \
     media_profiles_V1_0.dtd \
     MediaProvider \
     mediaserver \
+    mediaswcodec \
     mke2fs \
     monkey \
     mtpd \
diff --git a/target/product/mainline_arm64.mk b/target/product/mainline_arm64.mk
index 4e511e1e0..129427f0a 100644
--- a/target/product/mainline_arm64.mk
+++ b/target/product/mainline_arm64.mk
@@ -27,5 +27,4 @@ PRODUCT_SHIPPING_API_LEVEL := 28
 PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
 PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST := \
   root/init.zygote64_32.rc \
-  system/etc/seccomp_policy/crash_dump.arm.policy \
-  system/etc/seccomp_policy/mediacodec.policy \
+