Merge "ART: Refactor run-test 104" am: 2dcfe269a6 am: 647b700b65 am: 58a32c7fa5
am: bdaf1cdee7

Change-Id: I2e23ea1274f3d39229feac29c0f8f20e84fd3779