Backport LockClock to CM10

Change-Id: I435efbb70171e6c0ec365c78bc778175b83f637d