Merge "Fix build issue for targets depending on libverity_tree" into main