Merge "Support generating fs-verity descriptor"