Merge "Fix build: Revert "Add verity support to `make dist`.""