Merge "Consolidate fs-verity wrapper in libfsverity_rs" am: 93302519d4 am: 6df71858ac

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2492595

Change-Id: I43f4139177d321b05bd1ad6009d846a26dc77065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>