64dad838e61e92e4a72437b153c5eba7a200fb4a

The original change was reverted due to a breakage in the chrome build. This change includes a fix for this. TBR=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/49329004 Cr-Commit-Position: refs/heads/master@{#9169}
Description
No description provided
Languages
C++
88.6%
C
3.3%
Java
3%
Objective-C++
1.9%
Python
1.9%
Other
1%