Merge "Remove libdl from shared_libs"