Don't shadow str

In the timeutils test cases we were shadowing the str keyword with
local variables.  Let's not do that.

Change-Id: I07571e652894b7d47962969be984c9e574a0fe59
Merge "Don't shadow str"