Merge "Restore libc __cxa_atexit symbol"
am: b5d91e2ece

* commit 'b5d91e2ecec747f6e6c3fe4a1386136a0dd7a5dc':
  Restore libc __cxa_atexit symbol