Merge "Remove explicit dependency on libdl"