BUG=none TBR=kjellander@webrtc.org patch from issue 2990533002 at patchset 1 (http://crrev.com/2990533002#ps1) Already lgtm'ed in original issue. This only fixes trivial compilation errors. Review-Url: https://codereview.webrtc.org/2989613002 Cr-Commit-Position: refs/heads/master@{#19133}