[automerger skipped] Update VTS tests with the new test harness. am: bcaa78293a am: 5fb57da9a2 am: c0ab90d98a am: eacac2df48
am: 5db066d298 -s ours
am skip reason: change_id I539e75585b2cc01d153565814491361adfa048be with SHA1 9e2b97b83c is in history

Change-Id: I49518e0f5e302d13f186ccb0fd400c48980caa3c