am 294e610f: Merge "Fix verity on system partitions larger than 2G"

* commit '294e610f886eeb839d16172bb5b98559a6a7434d':
  Fix verity on system partitions larger than 2G