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

* commit '5f29c32844d8997d65a4ac8e8d9efa7903d6f83a':
  Make atexit.dlclose work for glibc