Merge "Remove "private/bionic_pthread.h"."