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

Change-Id: I81178e39739655e06948ff8e737bfdd31867d847