Merge "ART: Refactor run-test 913"
am: 8d7f78d63b

Change-Id: Ib122a0f2200efd554fadaeedef7eccff31e7cc99