f955b5d3f52db0f7456bd6c6bd4068d3599967da

Re-land of noharic@'s CL at https://webrtc-codereview.appspot.com/48129004 which was reverted due to a Mac compile error which most likely was a Goma flake (it passed on all trybots). TBR=stefan@webrtc.org, noharic@webrtc.org Review URL: https://webrtc-codereview.appspot.com/44329005 Cr-Commit-Position: refs/heads/master@{#9079}
Description
No description provided
Languages
C++
88.6%
C
3.3%
Java
3%
Objective-C++
1.9%
Python
1.9%
Other
1%