Merge "Factor out the hashtree info from the verity_info"