Merge "ART: Memory order updates to trace.{h,cc}" am: 203d5d8437
am: 523f1af4bf

Change-Id: I1a5cf847373ac518d9e40c8feaec704f0bf82889