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

Change-Id: I06694338dcdce2678bb27d28c364d81c89a0e9d8