Merge "Fix issues in ART testrunner"