4bf12eafba4e18504ac22080262dba61b4c8b9e7

This reverts commit f65de8483e
.
It was breaking the build bots: http://build.chromium.org/p/client.webrtc/builders/Win%20DrMemory%20Light/builds/3062
TBR=decurtis
BUG=
Review URL: https://webrtc-codereview.appspot.com/54539004
Cr-Commit-Position: refs/heads/master@{#9267}
Description
No description provided
Languages
C++
76%
C
16%
Python
2.3%
Java
2.1%
Objective-C++
1.5%
Other
1.9%