Merge "Revert "Reserve space in pthread structures for future extensibility.""