Merge "Make test_options.timeout an int64"
am: c56651b345

Change-Id: If57d4ce65e9e55e89c6e41376b1fa08447062666