Merge "Move frameworks/av off <sys/atomics.h>."