Merge "verity: Update the build rules for verity tools."