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

Change-Id: I3d8a611fb977f770faae9d217dcdaca571151d7e