Revert "Fix issues in ART testrunner"
am: 58640177fc

Change-Id: Iac0a77a66f5617f8d9542fd564447fc4dd291c78