Merge "Make dlerror(3) thread-safe."