am d43f9fdc: am ea3b7124: Merge "bionic test libc: clean up test for pthread_once"

* commit 'd43f9fdc708726bef2df59f836f1ade962da43a7':
  bionic test libc: clean up test for pthread_once