Merge "verity: clean up verity build dependencies"