Merge \"Fix missing atexit in 21+ static ARM executables.\"
am: 256e246ae4

Change-Id: I09fdda904f21d5e880d1f622f0c26b4bfa88b16f