Merge "Set timeout for testrunner in go/ab"
am: 8fe41cf9c9

Change-Id: I24290d296d5ede08b62d0818833bb5ea1d4ad58e