resolved conflicts for merge of 7b6e6fa5 to kraken

Change-Id: I2b9b80a7fa32c56be2b85ff8be0d6e7ac1848afe

diff --cc libc/bionic/pthread.c
index 709e612,e17e366..6fd47f2
--- 1/libc/bionic/pthread.c
--- 2/libc/bionic/pthread.c
+++ b/libc/bionic/pthread.c
@@@ -44,7 -44,9 +44,10 @@@
  #include <assert.h>
  #include <malloc.h>
  #include <linux/futex.h>
 +#include <cutils/atomic-inline.h>
+ #include <sys/prctl.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
  
  extern int  __pthread_clone(int (*fn)(void*), void *child_stack, int flags, void *arg);
  extern void _exit_with_stack_teardown(void * stackBase, int stackSize, int retCode);

diff --cc libc/include/pthread.h
Simple merge