Merge "Revert "Add runpath to lshal_test"" into oc-mr1-dev