Merge "Make constructor and at_exit handler non-static" am: 7a9d252553

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1710388

Change-Id: I7d6083af847f0fc8b77e7b24a3bc9d92236e0b86