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

Change-Id: Ic7dbca2215a5ea5d804dd6471ff4ff8834ea8815