[automerger skipped] Merge "Move errno to a pthread_internal_t field." am: 913f808c am: f5fb5d9a am: d210359b -s ours Change-Id: I70054025407010596bd292aafdac614b3c581a2a