Merge "ART: Refactor run-test 911"
am: 0a5fa0cf48

Change-Id: I2bc2f097d7bf246875ae9ceac1517c442720e66a