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

Change-Id: I61d412251b47c7600bbd15e2f233b8a7634362b5