am 831405b7: Merge "Make atexit.dlclose work for glibc"

* commit '831405b749d15a11fb947a40d61fd858e952d860':
  Make atexit.dlclose work for glibc