Merge "pprof_proto_generator: friendlier sample_types"