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

Change-Id: I6973d920dc7b496c71287415ceebe03407a3f5fc