Merge "lshal: remove "// static" comments"
am: 8d2f788a05

Change-Id: Id2eacee2cd265922954cc3b480015c6fe9efa6d1