Revert "Remove harmful attempts to be helpful in pthread_mutex functions."

This reverts commit 53f15d0325feeaf7e58dc79fce4ddf55e0a64b7a.
Merge remote-tracking branch 'cm/cm-11.0' into kk