Merge "Add runpath to lshal_test" into oc-mr1-dev am: 3f3fe12c05
am: b8cdfee8a2

Change-Id: I08fd1a7cede3a8275080d1557dbfaae7a34aed17