Merge "Add RootTargetPreparer to CtsOnGsiTrebleFrameworkVintfTest" into pi-dev
am: 66d8308896

Change-Id: If27a511884e292484df5c132280fe32ca889c74d