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

* commit '072877af485d49f11e227c0d22a7bb4a341533d6':
  Revert "Rewrite atomic.h to use stdatomic.h."