3fbf3f8841
This reverts commit 5f4b7e2873864c61e2ad6d88679dcd5d321bfd16, since it broke some of the build bots. BUG=4696 TBR=bjornv@webrtc.org Review URL: https://codereview.webrtc.org/1166463006 Cr-Commit-Position: refs/heads/master@{#9380}