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

* commit '973c7d01d3479a36c83def27c045228f994a367b':
  bionic test libc: clean up test for pthread_once