Merge "Use ATRACE macros instead of Tracer statics"