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

Change-Id: Id358fb18b0b2044fd73850b1375c6c5fb34b3a4f