[automerger skipped] Modify 1.2 VTS tests to consume test struct directly. am: 6d0270b056 am: dbf94aa2df am: 1a00a6e898
am: 9641e72b92 -s ours
am skip reason: change_id I54ac97f62898e47a338b51cc6d895a0309ab001f with SHA1 491b0a8913 is in history

Change-Id: Idcdd3e2bc65908c0fdce9f101886795fb3823eec