lsof: Compilation fixes for L

Change-Id: I1fa2bc9aeeebf768cdbf04c9cea7d8f1032dffeb
Merge branch 'cm' into HEAD