Fix build after merge.

* Timer API changes.