bc440d56513eeb15e1e31b5c5232e215556ffbbe

This reverts commit 15b58eea282b03b6347c64714079691f55e6097f. BUG=499241 TBR=andrew Review URL: https://codereview.webrtc.org/1182683003 Cr-Commit-Position: refs/heads/master@{#9426}
Description
No description provided
Languages
C++
88.6%
C
3.3%
Java
3%
Objective-C++
1.9%
Python
1.9%
Other
1%