patchelf --replace-needed libmedia.so libmedia_ims.so $BLOB_ROOT/lib64/libmediaadaptor.so
patchelf --add-needed libaudioproxy_shim.so $BLOB_ROOT/vendor/lib/libaudioproxy.so
patchelf --add-needed libmemset.so $BLOB_ROOT/vendor/bin/charge_only_mode
+patchelf --add-needed libdemangle.so $BLOB_ROOT/vendor/lib/libhifills.so
+patchelf --add-needed libdemangle.so $BLOB_ROOT/vendor/lib64/libhifills.so
# Remove libhidltransport dependency
patchelf --remove-needed libhidltransport.so $BLOB_ROOT/vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-rbs