Integrated new LockClock into AOSP build