am 64d7117e: Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h.""

* commit '64d7117efc7f7b8b477cd216a119b07041d8f406':
  Second attempt to "Rewrite atomic.h to use stdatomic.h."