3fbf3f8841b5460503fb646eaedcb063620434a8

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}
Description
No description provided
Languages
C++
88.6%
C
3.3%
Java
3%
Objective-C++
1.9%
Python
1.9%
Other
1%