Merge "verity: switch to C++ version of build_verity_tree"