Merge "Properly fail with ESRCH when pthread_killing an exited thread." am: 7ff7d03286
am: 104fd9e649

Change-Id: Ibe2909f6289db2b2412b71b812c4487cda7d2f68