Revert "change out dashclock for cm's lockclock"

This reverts commit 046f6576e48515dc85418e64e911e2ad13c99c4d.

Conflicts:

	config/common.mk