1f629232d5f852452499104c28e7d61c7b0b8c77

This reverts commit fd32f35aff8fc28ec084bddc274de284e0422a57. TBR=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/55369004 Cr-Commit-Position: refs/heads/master@{#9165}
Description
No description provided
Languages
C++
88.6%
C
3.3%
Java
3%
Objective-C++
1.9%
Python
1.9%
Other
1%