Propagate timeout to run-test-jar. am: 4815e7209e am: c5434f09f5
am: c6894e4229

Change-Id: I905680930b8453b2dcc3710f4768eb0a41e966a4