am c2483ea9: am 9434e8fe: Merge "Make the dlfcn mutex static."

* commit 'c2483ea9b63de373e7521e39162395a8c667239a':
  Make the dlfcn mutex static.