am 6dbfddfe: (-s ours) am b9e49ad5: Use a recursive lock for pthread_once. DO NOT MERGE.

Merge commit '6dbfddfe4e76790ee57ddc0a77b64a9457ec08fb'

* commit '6dbfddfe4e76790ee57ddc0a77b64a9457ec08fb':
  Use a recursive lock for pthread_once. DO NOT MERGE.