Merge "Update trace_processor_shell" into main