Return to CM LockClock

They reverted the Google services breaker, so it builds fine again

This reverts commit 167613de9884f4b3b19d0c1acd3ec88a789e31c2.

Change-Id: I891fda73bd18161bfc22835367688778f0e1c4d9