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

Change-Id: Ia3d3ff1f3ec1ce20b729feeee21956af64cae6c2