diff --git a/audio/aidl.mk b/audio/aidl.mk
index b8fd96b..e06ac0b 100644
--- a/audio/aidl.mk
+++ b/audio/aidl.mk
@@ -6,9 +6,6 @@ PRODUCT_PACKAGES += \
     android.hardware.audio.service-aidl.aoc \
     vendor.google.whitechapel.audio.hal.parserservice \
 
-# AIDL software effects. These are the effects supporting in all projects.
-# For the project-specific effects, such as haptic generator, please add them
-# to makefile in the project's device folder.
 PRODUCT_PACKAGES += \
     libvisualizeraidl \
     libbundleaidl \
@@ -16,6 +13,7 @@ PRODUCT_PACKAGES += \
     libdynamicsprocessingaidl \
     libloudnessenhanceraidl \
     libdownmixaidl \
+    libhapticgeneratoraidl \
 
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/aidl
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hdmi_audio
diff --git a/gps/lsi/sepolicy/hal_gnss_default.te b/gps/lsi/sepolicy/hal_gnss_default.te
index 0294a93..7d363f0 100644
--- a/gps/lsi/sepolicy/hal_gnss_default.te
+++ b/gps/lsi/sepolicy/hal_gnss_default.te
@@ -11,6 +11,3 @@ get_prop(hal_gnss_default, vendor_gps_prop)
 
 #IPC between pixel and vendor HAL
 binder_call(hal_gnss_default, hal_gnss_pixel)
-
-# Allow connect to gnss service
-allow hal_gnss_default vendor_gps_file:fifo_file create_file_perms;
diff --git a/gps/pixel/sepolicy/hal_gnss_pixel.te b/gps/pixel/sepolicy/hal_gnss_pixel.te
index 9a0b648..512ecc9 100644
--- a/gps/pixel/sepolicy/hal_gnss_pixel.te
+++ b/gps/pixel/sepolicy/hal_gnss_pixel.te
@@ -12,15 +12,3 @@ allow hal_gnss_pixel sysfs_modem_state:file r_file_perms;
 
 #Toggle coredump node
 allow hal_gnss_pixel sysfs_gps:file rw_file_perms;
-
-# Allow access to CHRE multiclient HAL.
-get_prop(hal_gnss_pixel, vendor_chre_hal_prop)
-
-# Allow binder to CHRE.
-binder_call(hal_gnss_pixel, hal_contexthub_default)
-allow hal_gnss_pixel hal_contexthub_service:service_manager find;
-
-# Allow connect to gnss service
-allow hal_gnss_pixel vendor_gps_file:dir create_dir_perms;
-allow hal_gnss_pixel vendor_gps_file:fifo_file create_file_perms;
-