1064679bbabcd01266edadad54a0377ca57c8fd8

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