Merge "lshal: remove "// static" comments" am: 8d2f788a05 am: 7d6944d40a
am: 45bf90c166

Change-Id: I3fd98e82715890ed1a83862dfe369a15b316c3ad