am b907051f: (-s ours) am 708a75ba: am ad05e868: Merge "ndk: Fix <sys/atomics.h> declarations."

* commit 'b907051f108b7c0a75845c49bb2e540ecc36fcb4':
  ndk: Fix <sys/atomics.h> declarations.