am a2f596b6: Merge "Make dlerror(3) thread-safe."

* commit 'a2f596b65075db7916ffffa2f5059e7953719578':
  Make dlerror(3) thread-safe.