am 51e32b52: Merge "Move trace.h to stdatomic."

* commit '51e32b52a3d087aec0e80df93129d598221bf312':
  Move trace.h to stdatomic.