diff --git a/manifest.xml b/manifest.xml
index f072e10..86cd85c 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -68,7 +68,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" override="true">
+    <hal format="hidl">
         <name>android.hardware.keymaster</name>
         <transport>hwbinder</transport>
         <version>3.0</version>
diff --git a/redroid.mk b/redroid.mk
index 1d75b48..932096b 100644
--- a/redroid.mk
+++ b/redroid.mk
@@ -65,7 +65,6 @@ PRODUCT_PACKAGES += \
     android.hardware.configstore@1.1-service \
     android.hardware.drm@1.0-service \
     android.hardware.drm@1.0-impl \
-    android.hardware.drm@1.1-service.clearkey \
     android.hardware.gatekeeper@1.0-service \
     android.hardware.gatekeeper@1.0-impl \
     android.hardware.graphics.allocator@2.0-service \
@@ -75,6 +74,7 @@ PRODUCT_PACKAGES += \
     android.hardware.graphics.mapper@2.0-impl \
     android.hardware.keymaster@3.0-service \
     android.hardware.keymaster@3.0-impl \
+    android.hardware.media.omx@1.0-service \
 
 
 PRODUCT_COPY_FILES += \