Merge "Modify sftrace macros to go through tracing_perfetto lib" into main