Merge "Fix race when frees after main thread finishes." am: 48e981556e

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1755319

Change-Id: I97f767ba2b220164c140c5c848635a9ca73599d9