Merge "bionic test libc: clean up test for pthread_once"