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

Change-Id: I01b1c9aad77015eab7bc462f6a9d574a5dbf04f9