Merge "Revert "Rewrite atomic.h to use stdatomic.h.""