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

Change-Id: Ie02b195355588cd3cd140438f6f1de6672527c57