Merge "ART: Refactor run-test 924" am: 70d9cf92f6 am: 414977a488
am: 9bbd792f15

Change-Id: Ia6eace25d865026156e4b89962f00d66e157f959