Merge "Make constructor and at_exit handler non-static" into sc-dev am: 32cb3c71bd

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

Change-Id: I56dbc852e378630d1f844ca9f45fe7b0b051f8d3