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