diff --git a/aosp/packages/modules/Bluetooth/tools/rootcanal/net/posix/posix_async_socket_server.cc b/aosp/packages/modules/Bluetooth/tools/rootcanal/net/posix/posix_async_socket_server.cc
index c7c63d56f068a0cb7ccb1eeafe2c5b983c77d30f..d91def680204f2e0f0e53831cb62eeaf95fc03de 100644
--- a/aosp/packages/modules/Bluetooth/tools/rootcanal/net/posix/posix_async_socket_server.cc
+++ b/aosp/packages/modules/Bluetooth/tools/rootcanal/net/posix/posix_async_socket_server.cc
@@ -132,4 +132,4 @@ void PosixAsyncSocketServer::AcceptSocket() {
 
 void PosixAsyncSocketServer::StopListening() { server_socket_->StopWatching(); }
 }  // namespace net
-}  // namespace android
\ No newline at end of file
+}  // namespace android
diff --git a/aosp/vendor/common/hals/gatekeeper/apex_file_contexts b/aosp/vendor/common/hals/gatekeeper/apex_file_contexts
index 1ac347d34450997e2da922ff7b2d55219a1992cd..7b9705c54615c5ade321e9ee43b5da6148f05f7a 100644
--- a/aosp/vendor/common/hals/gatekeeper/apex_file_contexts
+++ b/aosp/vendor/common/hals/gatekeeper/apex_file_contexts
@@ -1,3 +1,3 @@
 (/.*)?                                                          u:object_r:vendor_file:s0
 /etc(/.*)?                                                      u:object_r:vendor_configs_file:s0
-/bin/hw/android\.hardware\.gatekeeper-service                   u:object_r:hal_gatekeeper_remote_exec:s0
+/bin/hw/android\.hardware\.gatekeeper-service                   u:object_r:hal_gatekeeper_hw_exec:s0
diff --git a/aosp/vendor/common/hals/keymint/file_contexts b/aosp/vendor/common/hals/keymint/file_contexts
index 15122a0f45fd35c7be92d7fa0b73d43420912ccb..47c6698653eff15d3b67b7906ec14ab3f46a075c 100644
--- a/aosp/vendor/common/hals/keymint/file_contexts
+++ b/aosp/vendor/common/hals/keymint/file_contexts
@@ -1,3 +1,3 @@
 (/.*)?                                                              u:object_r:vendor_file:s0
 /etc(/.*)?                                                          u:object_r:vendor_configs_file:s0
-/bin/hw/android\.hardware\.security\.keymint-service\.rust\.trust   u:object_r:hal_keymint_rust_exec:s0
\ No newline at end of file
+/bin/hw/android\.hardware\.security\.keymint-service\.rust\.trust   u:object_r:hal_keymint_hw_exec:s0
\ No newline at end of file
diff --git a/aosp/vendor/common/hals/oemlock/apex_file_contexts b/aosp/vendor/common/hals/oemlock/apex_file_contexts
index 8fb049b5a0ee4b1f7776e0adb4b33bc6ddd16787..8850e20948fda1964b8ffbc2c027864160096c5a 100644
--- a/aosp/vendor/common/hals/oemlock/apex_file_contexts
+++ b/aosp/vendor/common/hals/oemlock/apex_file_contexts
@@ -1,3 +1,3 @@
 (/.*)?                                                          u:object_r:vendor_file:s0
 /etc(/.*)?                                                      u:object_r:vendor_configs_file:s0
-/bin/hw/android\.hardware\.oemlock-service                      u:object_r:hal_oemlock_remote_exec:s0
+/bin/hw/android\.hardware\.oemlock-service                      u:object_r:hal_oemlock_hw_exec:s0