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

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

Change-Id: I14f71e5cc388cb8c6aa257e0f8cee198d3e1d869