Modify 1.1 VTS tests to consume test struct directly. am: 0c03b85005
am: 37f937b7ce

Change-Id: I9df06729490dd2c5669062e740354dadff43b165