diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 8d5a596..f4f5b2c 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -101,6 +101,10 @@ BOARD_KERNEL_CMDLINE += iptable_raw.raw_before_defrag=1
 BOARD_KERNEL_CMDLINE += ip6table_raw.raw_before_defrag=1
 BOARD_KERNEL_CMDLINE += video=vfb:640x400,bpp=32,memsize=3072000
 
+# Media
+TARGET_USES_ION := true
+TARGET_DISABLED_UBWC := true
+
 # Partitions
 BOARD_BOOTIMAGE_PARTITION_SIZE := 134217728
 BOARD_DTBOIMG_PARTITION_SIZE := 8388608
diff --git a/holi.mk b/holi.mk
index 56ba10d..f4ed720 100644
--- a/holi.mk
+++ b/holi.mk
@@ -163,6 +163,26 @@ PRODUCT_PACKAGES += \
     libipanat \
     liboffloadhal
 
+# Media
+PRODUCT_PACKAGES += \
+    libavservices_minijail \
+    libavservices_minijail.vendor \
+    libavservices_minijail_vendor \
+    libcodec2_hidl@1.1.vendor \
+    libmm-omxcore \
+    libOmxAacEnc \
+    libOmxAmrEnc \
+    libOmxCore \
+    libOmxEvrcEnc \
+    libOmxG711Enc \
+    libOmxQcelp13Enc \
+    libOmxVdec \
+    libOmxVenc \
+    libstagefrighthw \
+    libstagefright_omx \
+    libstagefright_foundation \
+    libstagefright_softomx.vendor
+
 # Partitions
 PRODUCT_BUILD_SUPER_PARTITION := false
 PRODUCT_USE_DYNAMIC_PARTITIONS := true