Merge "Add unit tests to build_verity_tree"
am: 5358f2e8fe

Change-Id: I377bbc1812a3f8a5da8562c01fa4a5aac6590aa5