Merge "Convert verity tools to subprocess"
am: 6a28545530

Change-Id: I640228fc63e3bbe56d0d101a7cda5702266dc8f2