Merge "Sync pthread.h and resolv.h"