Merge "ART Test Runner"
am: 857acf51fb

Change-Id: Ief255daa2d698a6329f5c4f5b05718331b528a8d