37ebcf0ce5
patchset #10 id:180001 of https://codereview.webrtc.org/1511633002/ This reverts commit bc14164aad254e72ce4d1e381b912b7d3acf5391. We have made more preparations downstream, so this should work now. Original CL by perkj@. BUG=webrtc:2365 The work started from the work by kjellander@ in https://codereview.webrtc.org/1413663003/ Review URL: https://codereview.webrtc.org/1570513004 Cr-Commit-Position: refs/heads/master@{#11186}