Merge "Fix pthread_t confusion." into m-wireless-dev