Merge "Add verity support to `make dist`."