am 6d42eda2: am 0cd5ec5b: Merge "Fix build: Revert "Add verity support to `make dist`.""

* commit '6d42eda2315dfce59e3a64eb938b85fefe3c2107':