Merge "set-verity-state: Simplify code path around overlayfs_setup()"