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

Change-Id: I91100d1afc4b412bc83cac81462ad3ff79fb48d4