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

Change-Id: Ia7fdc430037a9af301e871beac9a35d54f28c6d9