Merge "Restore libc __cxa_atexit symbol" am: b5d91e2ece
am: 300ef48c25

* commit '300ef48c25610fd74f63de4c9204334638680a39':
  Restore libc __cxa_atexit symbol