Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h.""