Merge "ART: Memory order updates to trace.{h,cc}"