am 852b3581: Merge "Sync pthread.h and resolv.h"

* commit '852b358185a910bb3bdc9cec1ef3752c9bb4c522':
  Sync pthread.h and resolv.h