Revert "Use the Stopwatch class, as it's available."

This reverts commit 8d7e0b246c4402be8c3d0417dc4e4b84c6c7c37d.

Unfortunately, we can't rely on guava in the main code, as it's an
additional dependency.  Test only, I'm afraid.