Merge "Improve the dynamic linker diagnostics."