Merge "support LIB in runpath" am: a9aeccbf74
am: b621d1474d

Change-Id: Iac47ccf08a2acd1f97472d0d57534053776bdb2b