Merge "ART: Change SCOPED_TRACE implementation"