Merge "Fix verity on system partitions larger than 2G"