Downstream projects adapted, clean up. Bug: webrtc:7494 Change-Id: I019b8dd79c6bc55c900fb5595d5e2ee8aa0a2400 Reviewed-on: https://webrtc-review.googlesource.com/c/110865 Commit-Queue: Alessio Bazzica <alessiob@webrtc.org> Reviewed-by: Alex Loiko <aleloi@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25656}