Merge "Mention why we don't have pthread_cancel()." am: 96fbba1ea0 am: c200d95e88

Change-Id: Ibd797c84b46052e51664aa0425ba8636e23aae8b