Clean up warnings in lk code

Change-Id: I05b3a6cf07cde7e60586b1816c2f1279f64f5cf4
30 files changed