Merge "Fix issues in ART testrunner"
am: 4732ee50a1

Change-Id: I79fbe4ec26c773baf27b099761f030929d2df57b