Merge "Fix liblp imported both as static and dynamic lib"