am a161eea2: am 7f3d6b69: am 0a5b0166: Merge "Register _cleanup function with atexit"

* commit 'a161eea241da06c70995248df7a00b6553050e05':
  Register _cleanup function with atexit