Merge "Leave more space for extensions in pthread_rwlockattr_t"