ART: Properly kill timed-out test am: 1ec82e562a am: 8834fb5928
am: 2035d99842

Change-Id: I95791dde953d4ad79538046b504ec8abe8f58329