b6f3916c48
These two files turn out to be entangled with each other. Keeping them together for now. This is a simpler approach than the one attempted in https://webrtc-review.googlesource.com/c/src/+/251060 but leaves cleanup of the relationship to a later work item. Bug: webrtc:13634 Change-Id: I2b38f86c0c510332dc24a6b83531aee143a5df10 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/251240 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#35942}