Merge "bionic: Do not use <sys/atomics.h> for platform code."