am cc9b7456: Merge "Move the pthread debugging flags to the right place."

* commit 'cc9b7456b66b7c7c218a9d1f00d7aef1f5ecf409':
  Move the pthread debugging flags to the right place.