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

Change-Id: Ic205bc9b525a9b6ae9396257fd855b6b3c11f835