Revert "Fix issues in ART testrunner"

This reverts commit e2f7cedae1aaa4d100bcee558ab5e7abf5ef8b5f.

Change-Id: I888be2bd1205e3eac3923695cb3f24c4e858e868
2 files changed