Merge "Add RootTargetPreparer to CtsOnGsiTrebleFrameworkVintfTest" into pi-dev