This CL contains some preparatory cleanup that can be done outside the main CL. Bug: webrtc:11255 Change-Id: Ib0dcd81d352bafc446dcd2f7f82ba81f5e82e210 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/165766 Commit-Queue: Sebastian Jansson <srte@webrtc.org> Reviewed-by: Artem Titov <titovartem@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30247}