Merge "Cleaned up pthread rwlocks implementation."