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

Change-Id: I0db9e81f3f7241d8fe14bcd4280c3a31678ae14f