diff --git a/build/soong/policy.go b/build/soong/policy.go
index 6b7bd5f..7b2122c 100644
--- a/build/soong/policy.go
+++ b/build/soong/policy.go
@@ -33,7 +33,6 @@
 
 // This order should be kept. checkpolicy syntax requires it.
 var policyConfOrder = []string{
-	"flagging_macros",
 	"security_classes",
 	"initial_sids",
 	"access_vectors",
diff --git a/flagging/Android.bp b/flagging/Android.bp
index 268670c..26e8989 100644
--- a/flagging/Android.bp
+++ b/flagging/Android.bp
@@ -55,5 +55,5 @@
 
 filegroup {
     name: "sepolicy_flagging_macros",
-    srcs: ["flagging_macros"],
+    srcs: ["te_macros"],
 }
diff --git a/flagging/flagging_macros b/flagging/te_macros
similarity index 100%
rename from flagging/flagging_macros
rename to flagging/te_macros
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index e9b4b1e..dce4898 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -107,7 +107,6 @@
 
 se_policy_conf {
     name: "microdroid_reqd_policy_mask.conf",
-    defaults: ["se_policy_conf_flags_defaults"],
     srcs: reqd_mask_files,
     installable: false,
     mls_cats: 1,
@@ -122,7 +121,6 @@
 
 se_policy_conf {
     name: "microdroid_plat_sepolicy.conf",
-    defaults: ["se_policy_conf_flags_defaults"],
     srcs: system_policy_files,
     installable: false,
     mls_cats: 1,
@@ -137,7 +135,6 @@
 
 se_policy_conf {
     name: "microdroid_plat_pub_policy.conf",
-    defaults: ["se_policy_conf_flags_defaults"],
     srcs: system_public_policy_files,
     installable: false,
     mls_cats: 1,
@@ -175,7 +172,6 @@
 
 se_policy_conf {
     name: "microdroid_vendor_sepolicy.conf",
-    defaults: ["se_policy_conf_flags_defaults"],
     srcs: vendor_policy_files,
     installable: false,
     mls_cats: 1,
diff --git a/prebuilts/api/29.0/Android.bp b/prebuilts/api/29.0/Android.bp
index 797b4b5..8acca29 100644
--- a/prebuilts/api/29.0/Android.bp
+++ b/prebuilts/api/29.0/Android.bp
@@ -14,7 +14,6 @@
 
 se_policy_conf {
     name: "29.0_plat_pub_policy.conf",
-    defaults: ["se_policy_conf_flags_defaults"],
     srcs: [
         ":se_build_files{.plat_public_29.0}",
         ":se_build_files{.reqd_mask}",
@@ -33,7 +32,6 @@
 
 se_policy_conf {
     name: "29.0_product_pub_policy.conf",
-    defaults: ["se_policy_conf_flags_defaults"],
     srcs: [
         ":se_build_files{.plat_public_29.0}",
         ":se_build_files{.system_ext_public_29.0}",
diff --git a/prebuilts/api/30.0/Android.bp b/prebuilts/api/30.0/Android.bp
index 30be837..6f3254d 100644
--- a/prebuilts/api/30.0/Android.bp
+++ b/prebuilts/api/30.0/Android.bp
@@ -14,7 +14,6 @@
 
 se_policy_conf {
     name: "30.0_plat_pub_policy.conf",
-    defaults: ["se_policy_conf_flags_defaults"],
     srcs: [
         ":se_build_files{.plat_public_30.0}",
         ":se_build_files{.reqd_mask}",
@@ -33,7 +32,6 @@
 
 se_policy_conf {
     name: "30.0_product_pub_policy.conf",
-    defaults: ["se_policy_conf_flags_defaults"],
     srcs: [
         ":se_build_files{.plat_public_30.0}",
         ":se_build_files{.system_ext_public_30.0}",
diff --git a/prebuilts/api/31.0/Android.bp b/prebuilts/api/31.0/Android.bp
index cf8de96..caf1c10 100644
--- a/prebuilts/api/31.0/Android.bp
+++ b/prebuilts/api/31.0/Android.bp
@@ -14,7 +14,6 @@
 
 se_policy_conf {
     name: "31.0_plat_pub_policy.conf",
-    defaults: ["se_policy_conf_flags_defaults"],
     srcs: [
         ":se_build_files{.plat_public_31.0}",
         ":se_build_files{.reqd_mask}",
@@ -33,7 +32,6 @@
 
 se_policy_conf {
     name: "31.0_product_pub_policy.conf",
-    defaults: ["se_policy_conf_flags_defaults"],
     srcs: [
         ":se_build_files{.plat_public_31.0}",
         ":se_build_files{.system_ext_public_31.0}",
diff --git a/prebuilts/api/32.0/Android.bp b/prebuilts/api/32.0/Android.bp
index 92c694b..9a2b4e2 100644
--- a/prebuilts/api/32.0/Android.bp
+++ b/prebuilts/api/32.0/Android.bp
@@ -14,7 +14,6 @@
 
 se_policy_conf {
     name: "32.0_plat_pub_policy.conf",
-    defaults: ["se_policy_conf_flags_defaults"],
     srcs: [
         ":se_build_files{.plat_public_32.0}",
         ":se_build_files{.reqd_mask}",
@@ -33,7 +32,6 @@
 
 se_policy_conf {
     name: "32.0_product_pub_policy.conf",
-    defaults: ["se_policy_conf_flags_defaults"],
     srcs: [
         ":se_build_files{.plat_public_32.0}",
         ":se_build_files{.system_ext_public_32.0}",
diff --git a/prebuilts/api/33.0/Android.bp b/prebuilts/api/33.0/Android.bp
index 211445f..0a01a44 100644
--- a/prebuilts/api/33.0/Android.bp
+++ b/prebuilts/api/33.0/Android.bp
@@ -14,7 +14,6 @@
 
 se_policy_conf {
     name: "33.0_plat_pub_policy.conf",
-    defaults: ["se_policy_conf_flags_defaults"],
     srcs: [
         ":se_build_files{.plat_public_33.0}",
         ":se_build_files{.reqd_mask}",
@@ -33,7 +32,6 @@
 
 se_policy_conf {
     name: "33.0_product_pub_policy.conf",
-    defaults: ["se_policy_conf_flags_defaults"],
     srcs: [
         ":se_build_files{.plat_public_33.0}",
         ":se_build_files{.system_ext_public_33.0}",
diff --git a/prebuilts/api/34.0/Android.bp b/prebuilts/api/34.0/Android.bp
index b52801f..b3be5bb 100644
--- a/prebuilts/api/34.0/Android.bp
+++ b/prebuilts/api/34.0/Android.bp
@@ -14,7 +14,6 @@
 
 se_policy_conf {
     name: "34.0_plat_pub_policy.conf",
-    defaults: ["se_policy_conf_flags_defaults"],
     srcs: [
         ":se_build_files{.plat_public_34.0}",
         ":se_build_files{.reqd_mask}",
@@ -33,7 +32,6 @@
 
 se_policy_conf {
     name: "34.0_product_pub_policy.conf",
-    defaults: ["se_policy_conf_flags_defaults"],
     srcs: [
         ":se_build_files{.plat_public_34.0}",
         ":se_build_files{.system_ext_public_34.0}",
diff --git a/private/access_vectors b/private/access_vectors
index 9d82ac8..7a280c5 100644
--- a/private/access_vectors
+++ b/private/access_vectors
@@ -139,8 +139,8 @@
 	block_suspend
 	audit_read
 	perfmon
-	starting_at_board_api(202504, `checkpoint_restore')
-	starting_at_board_api(202504, `bpf')
+	checkpoint_restore
+	bpf
 }
 
 #