Merge "ndk: <pthread.h>: formatting + updates"