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

Change-Id: If1d6d7c0b0c821ccc157b494e24ee3acac63bc9b