cbf0927473c10a0a25bbf55707f1ca2b2fd57708

This reverts commit 9e1a6d7c236c9a8a322bef54d4ec2a087e5baa07, because Chromium for Android still isn't happy with it. TBR=tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/49869004 Cr-Commit-Position: refs/heads/master@{#9122}
Description
No description provided
Languages
C++
88.6%
C
3.3%
Java
3%
Objective-C++
1.9%
Python
1.9%
Other
1%