Merge "ART: Refactor run-test 104"
am: 2dcfe269a6

Change-Id: I7a3f015ef4c624ffa8222417a225aa721f76e106