Merge "Revert "Set timeout for testrunner in go/ab""
am: e5b1add0a3

Change-Id: I2da8de80441c2d2cd4bb68e9eb2ad42c210bec63