Merge "Let VerityUtils changes trigger more fs-verity related tests"