Remove LockClock - already in android_build