Merge "Add RootTargetPreparer to vts_treble_vintf_* tests"