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

* commit '972a8de7a4fa8f05849dbecde8d700a8522c5b3d':
  Move trace.h to stdatomic.