Merge "Revert "Add runpath to lshal_test"" into oc-mr1-dev am: 9c2336c0b3
am: f07ca33810

Change-Id: Ie15711cc0faa06889e59ffe1b51dd8884cdf1118