Manifest: Add LockClock (part 3 of 3)

Change-Id: Ic0b6ce8043fc241cca21f23edeb89523fdd33620
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android into HEAD