diff --git a/extract-files.sh b/extract-files.sh
index 09fa827..00de98c 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -67,5 +67,7 @@ fi
 BLOB_ROOT="${LINEAGE_ROOT}/vendor/${VENDOR}/${DEVICE_COMMON}/proprietary"
 
 patchelf --add-needed "libshim_stagefright_foundation.so" "${BLOB_ROOT}/vendor/lib/libstagefright_omx_utils.so"
+patchelf --add-needed "libunwindstack.so" "${BLOB_ROOT}/vendor/lib64/libhifills.so"
+patchelf --add-needed "libunwindstack.so" "${BLOB_ROOT}/vendor/lib/libhifills.so"
 
 "${MY_DIR}/setup-makefiles.sh"
diff --git a/universal7904-common.mk b/universal7904-common.mk
index cf51f79..7c0361a 100644
--- a/universal7904-common.mk
+++ b/universal7904-common.mk
@@ -66,7 +66,8 @@ PRODUCT_PACKAGES += \
     libhidltransport \
     libhidltransport.vendor \
     libhwbinder \
-    libhwbinder.vendor
+    libhwbinder.vendor \
+    libunwindstack.vendor
 
 # Init
 PRODUCT_PACKAGES += \