Vendor: Remove OTA and add LockClock

Change-Id: Ie7cb485747056c86023f320fb454d4b309019c15