ART: Simplify and tighten run-test timeouts
am: 60931d9f0a

Change-Id: I4b8d911040b00ed04ac97072e834e0281b848e57