diff --git a/device.mk b/device.mk
index 444e66a..65f196e 100644
--- a/device.mk
+++ b/device.mk
@@ -169,7 +169,7 @@ PRODUCT_PACKAGES += \
 
 # Fingerprint
 PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service \
+    android.hardware.biometrics.fingerprint@2.1-service_32 \
     fingerprint.msm8953
 
 # FM
@@ -333,7 +333,11 @@ PRODUCT_PACKAGES += \
     libshim_ril \
     libprotobuf-cpp-full \
     libxml2 \
-    rild_socket
+    rild_socket \
+    rild_32
+
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/rild/rild.rc:system/vendor/etc/init/rild.rc
 
 # Seccomp policy
 PRODUCT_COPY_FILES += \
diff --git a/fingerprint/Android.mk b/fingerprint/Android.mk
index 0a0ab61..5b7f7be 100644
--- a/fingerprint/Android.mk
+++ b/fingerprint/Android.mk
@@ -27,6 +27,9 @@ LOCAL_SHARED_LIBRARIES := \
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_MODULE := fingerprint.msm8953
 LOCAL_MODULE_TAGS := optional
+LOCAL_32_BIT_ONLY := true
 
 include $(BUILD_SHARED_LIBRARY)
 
+include $(call all-makefiles-under,$(LOCAL_PATH))
+
diff --git a/fingerprint/service_32/Android.mk b/fingerprint/service_32/Android.mk
new file mode 100644
index 0000000..27191d8
--- /dev/null
+++ b/fingerprint/service_32/Android.mk
@@ -0,0 +1,22 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.biometrics.fingerprint@2.1-service_32
+LOCAL_INIT_RC := android.hardware.biometrics.fingerprint@2.1-service_32.rc
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_32_BIT_ONLY := true
+LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_SRC_FILES := \
+    ../../../../../hardware/interfaces/biometrics/fingerprint/2.1/default/BiometricsFingerprint.cpp \
+    ../../../../../hardware/interfaces/biometrics/fingerprint/2.1/default/service.cpp
+
+LOCAL_SHARED_LIBRARIES := \
+    libcutils \
+    liblog \
+    libhidlbase \
+    libhidltransport \
+    libhardware \
+    libutils \
+    android.hardware.biometrics.fingerprint@2.1
+
+include $(BUILD_EXECUTABLE)
\ No newline at end of file
diff --git a/fingerprint/service_32/android.hardware.biometrics.fingerprint@2.1-service_32.rc b/fingerprint/service_32/android.hardware.biometrics.fingerprint@2.1-service_32.rc
new file mode 100644
index 0000000..d4d5a91
--- /dev/null
+++ b/fingerprint/service_32/android.hardware.biometrics.fingerprint@2.1-service_32.rc
@@ -0,0 +1,7 @@
+service fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service_32
+    # "class hal" causes a race condition on some devices due to files created
+    # in /data. As a workaround, postpone startup until later in boot once
+    # /data is mounted.
+    class late_start
+    user system
+    group system input
\ No newline at end of file
diff --git a/rild/Android.mk b/rild/Android.mk
new file mode 100644
index 0000000..927bc19
--- /dev/null
+++ b/rild/Android.mk
@@ -0,0 +1,33 @@
+# Copyright 2006 The Android Open Source Project
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES:= \
+	../../../../hardware/ril/rild/rild.c
+
+LOCAL_SHARED_LIBRARIES := \
+	libcutils \
+	libdl \
+	liblog \
+	libril
+
+# Temporary hack for broken vendor RILs.
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+	librilutils_static
+
+LOCAL_CFLAGS := -DRIL_SHLIB
+LOCAL_CFLAGS += -Wall -Wextra -Werror
+
+ifeq ($(SIM_COUNT), 2)
+    LOCAL_CFLAGS += -DANDROID_MULTI_SIM
+    LOCAL_CFLAGS += -DANDROID_SIM_COUNT_2
+endif
+
+LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_32_BIT_ONLY := true
+LOCAL_MODULE := rild_32
+
+include $(BUILD_EXECUTABLE)
+
diff --git a/rild/rild.rc b/rild/rild.rc
new file mode 100644
index 0000000..968cd65
--- /dev/null
+++ b/rild/rild.rc
@@ -0,0 +1,5 @@
+service ril-daemon /vendor/bin/hw/rild_32
+    class main
+    user radio
+    group radio cache inet misc audio log readproc wakelock
+    capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 22ac6d3..b13e489 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -872,7 +872,7 @@ on property:ro.data.large_tcp_window_size=true
     # Adjust socket buffer to enlarge TCP receive window for high bandwidth (e.g. DO-RevB)
     write /proc/sys/net/ipv4/tcp_adv_win_scale  2
 
-service ril-daemon2 /vendor/bin/hw/rild -c 2
+service ril-daemon2 /vendor/bin/hw/rild_32 -c 2
     class main
     user radio
     group radio cache inet misc audio log readproc wakelock