Track lockclock from liquid

Change-Id: I56c413cfee00ef38d495eb1f6de5a64c42f6be60
Update manifest
Remove unused stuff