Merge "fs-verity: fix broken test testInstallEverything"