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

* commit '054627df6bdd1ab70942c9c5033e9e5d3d82666a':
  Revert "Rewrite atomic.h to use stdatomic.h."