Merge "Fix a race condition in the bionic pthread tests." am: a43e7a87b3

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

Change-Id: If8069be6bbe928637233cd910fad31b2e5bbc206