Cleanup based on review of move CL. Using separate CL to keep the move clean. Bug: webrtc:9155 Change-Id: Ie0b15c6d3efcd86e2fa5761f014d0daf72ccfa06 Reviewed-on: https://webrtc-review.googlesource.com/73367 Commit-Queue: Sebastian Jansson <srte@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23068}