command line: Forward --timeout values to caliper as --time-limit. am: 341c080d7b am: a01cb358e1
am: 7b0b977b46

Change-Id: I080a8648b18737b7fbfec58c460562e16366ef3d