Merge "Consolidate fs-verity wrapper in libfsverity_rs"