Mainly to get the __atexit_register_cleanup removals we suggested. Change-Id: I58d40b8c5b8401bfb6bfffe8f3430ac0718af917