Clean up more warnings in lk code

Change-Id: I71eb3f1730ae0c80ec4d0da12a5b5755bc9f5614
21 files changed