Merge "ndk: Fix <sys/atomics.h> declarations."