Merge "verity: Fix the broken 'build_verity_tree -A'."
am: 97d9efc6ab

Change-Id: Ibbfa251eb6cf53ead264cc2c60c4bb0a030163f8