Merge "Support regular fs-verity Merkle tree"