diff --git a/manifest.xml b/manifest.xml
index 0ae7e30..a82462d 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,7 +1,7 @@
 <manifest version="1.0" type="device">
     <hal format="hidl">
         <name>android.hardware.audio</name>
-        <transport arch="32">passthrough</transport>
+        <transport>hwbinder</transport>
         <version>2.0</version>
         <interface>
             <name>IDevicesFactory</name>
@@ -10,7 +10,7 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.audio.effect</name>
-        <transport arch="32">passthrough</transport>
+        <transport>hwbinder</transport>
         <version>2.0</version>
         <interface>
             <name>IEffectsFactory</name>
@@ -19,7 +19,7 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.bluetooth</name>
-        <transport arch="32">passthrough</transport>
+        <transport>hwbinder</transport>
         <version>1.0</version>
         <interface>
             <name>IBluetoothHci</name>
@@ -61,7 +61,7 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.gnss</name>
-        <transport arch="32">passthrough</transport>
+        <transport>hwbinder</transport>
         <version>1.0</version>
         <interface>
             <name>IGnss</name>
@@ -106,7 +106,7 @@
     </hal>    
     <hal format="hidl">
         <name>android.hardware.keymaster</name>
-        <transport arch="32">passthrough</transport>
+        <transport>hwbinder</transport>
         <version>3.0</version>
         <interface>
             <name>IKeymasterDevice</name>
@@ -128,7 +128,7 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.memtrack</name>
-        <transport arch="32">passthrough</transport>
+        <transport>hwbinder</transport>
         <version>1.0</version>
         <interface>
             <name>IMemtrack</name>
diff --git a/msm8226.mk b/msm8226.mk
index 43c64da..877770e 100644
--- a/msm8226.mk
+++ b/msm8226.mk
@@ -93,6 +93,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # Audio
 PRODUCT_PACKAGES += \
     android.hardware.audio@2.0-impl \
+    android.hardware.audio@2.0-service \
     android.hardware.audio.effect@2.0-impl \
     audio_policy.msm8226 \
     audio.a2dp.default \
@@ -108,6 +109,7 @@ PRODUCT_PACKAGES += \
 # Bluetooth
 PRODUCT_PACKAGES += \
     android.hardware.bluetooth@1.0-impl \
+    android.hardware.bluetooth@1.0-service \
     libbt-vendor
 
 # Boot animation
@@ -120,6 +122,7 @@ PRODUCT_PACKAGES += \
     android.hardware.graphics.composer@2.1-impl \
     android.hardware.graphics.mapper@2.0-impl \
     android.hardware.memtrack@1.0-impl \
+    android.hardware.memtrack@1.0-service \
     copybit.msm8226 \
     gralloc.msm8226 \
     hwcomposer.msm8226 \
@@ -144,6 +147,7 @@ PRODUCT_PACKAGES += \
 # GPS
 PRODUCT_PACKAGES += \
     android.hardware.gnss@1.0-impl \
+    android.hardware.gnss@1.0-service \
     gps.msm8226
 
 PRODUCT_COPY_FILES += \
@@ -164,7 +168,8 @@ PRODUCT_COPY_FILES += \
 
 # Keymaster
 PRODUCT_PACKAGES += \
-    android.hardware.keymaster@3.0-impl
+    android.hardware.keymaster@3.0-impl \
+    android.hardware.keymaster@3.0-service
 
 # LiveDisplay
 PRODUCT_PACKAGES += \
diff --git a/sepolicy/common/hal_bluetooth_default.te b/sepolicy/common/hal_bluetooth_default.te
new file mode 100644
index 0000000..2e32627
--- /dev/null
+++ b/sepolicy/common/hal_bluetooth_default.te
@@ -0,0 +1,7 @@
+allow hal_bluetooth_default bluetooth_device:chr_file w_file_perms;
+allow hal_bluetooth_default bt_fw_file:file r_file_perms;
+allow hal_bluetooth_default efs_file:dir search;
+allow hal_bluetooth_default firmware_file:dir r_dir_perms;
+allow hal_bluetooth_default proc_bt_sleep:dir w_dir_perms;
+allow hal_bluetooth_default proc_bt_sleep:file w_file_perms;
+allow hal_bluetooth_default wifi_data_file:file r_file_perms;
diff --git a/sepolicy/common/hal_gnss_default.te b/sepolicy/common/hal_gnss_default.te
new file mode 100644
index 0000000..f9aaacc
--- /dev/null
+++ b/sepolicy/common/hal_gnss_default.te
@@ -0,0 +1,3 @@
+allow hal_gnss_default location_data_file:file rw_file_perms;
+
+qmux_socket(hal_gnss_default)
diff --git a/sepolicy/common/hal_keymaster_default.te b/sepolicy/common/hal_keymaster_default.te
index 182cfba..44dff44 100644
--- a/sepolicy/common/hal_keymaster_default.te
+++ b/sepolicy/common/hal_keymaster_default.te
@@ -1,2 +1,4 @@
 allow hal_keymaster_default vfat:dir search;
 allow hal_keymaster_default vfat:file { getattr open read };
+
+r_dir_file(hal_keymaster_default, firmware_file)
diff --git a/sepolicy/common/hal_memtrack_default.te b/sepolicy/common/hal_memtrack_default.te
new file mode 100644
index 0000000..35cc326
--- /dev/null
+++ b/sepolicy/common/hal_memtrack_default.te
@@ -0,0 +1 @@
+dontaudit hal_memtrack_default { domain -surfaceflinger }:file read;