Merge "Refactor test harness for generated VTS tests" into oc-mr1-dev am: e5e339d2a5
am: 386a312465

Change-Id: I167f24761a5490a2297f664801001c54e8ff631b