Merge "Revert "Update trace_processor_shell"" into main