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

Change-Id: I7ce460c2ebd5a5312ffc4d6c52316829ab331c51