Merge changes I9b41e78f,Ia66e5da5

* changes:
  liblshal: make static
  lshal: use pragma once