Merge "ART: Fix SCOPED_TRACE macro"