am 5808b357: am 972a8de7: am 51e32b52: Merge "Move trace.h to stdatomic."

* commit '5808b3578aa871f7cf4eac3dda93604f9a014e50':
  Move trace.h to stdatomic.