Merge "fs_mgr: Don't try to suffix "vroot" with "-verity"."