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

Change-Id: I8c4cdf293fcc3ab8cde1aaf0ea589a095a062c71