diff --git a/Android.bp b/Android.bp
index 44f064e..15d1596 100644
--- a/Android.bp
+++ b/Android.bp
@@ -335,7 +335,6 @@
     src: ":system_ext_sepolicy.conf",
     system_ext_specific: true,
     filter_out: [":plat_sepolicy.cil"],
-    remove_line_marker: true,
 }
 
 // product_policy.conf - A combination of the private and public product policy
@@ -361,7 +360,6 @@
         ":plat_sepolicy.cil",
         ":system_ext_sepolicy.cil",
     ],
-    remove_line_marker: true,
 }
 
 // policy mapping files
@@ -477,7 +475,7 @@
     src: ":odm_sepolicy.conf",
     filter_out: [
         ":reqd_policy_mask.cil",
-        ":vendor_sepolicy.cil",
+        ":vendor_sepolicy.cil.raw",
     ],
     secilc_check: false, // will be done in se_versioned_policy module
     device_specific: true,
@@ -497,10 +495,7 @@
         ":plat_mapping_file",
         ":vendor_sepolicy.cil",
     ],
-    filter_out: [
-        ":plat_pub_versioned.cil",
-        ":vendor_sepolicy.cil",
-    ],
+    filter_out: [":plat_pub_versioned.cil"],
     device_specific: true,
 }