Merge "Move the pthread debugging flags to the right place."