am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""

* commit '41198eea42b7a6f1d4222abd7a5fec965d11b238':
  Revert "Rewrite atomic.h to use stdatomic.h."