Merge "Testrunner: Add timeout support"
am: 10f9467522

Change-Id: I184a468569dcda4e22ba614b1127bcaac17d96b6