28023653 factored the pthread types out so that they could be in both <sys/types.h> and <pthread.h>. Bug: N/A Test: builds Change-Id: Ie649c938ec8be1c59a0e4ef777f425550f8d4539