Merge "ART: Refactor run-test 924"
am: 70d9cf92f6

Change-Id: I805ddab8a1b96f53ba0f9dc67b0df98a429e088f