am 964684ba: am 535478dd: Merge "ndk: <pthread.h>: formatting + updates"

* commit '964684ba5b1a9254d1505b0ac9cc6fd43c5db1c9':
  ndk: <pthread.h>: formatting + updates