Merge "ART: Fix testrunner test reporting" am: 1a400bc46d
am: 514373e8c0

Change-Id: I944308f5a119b7ce72e0f7d3165472d6128af0ff