Merge "Add --libpath argv option to fix unittest failure"