Patch from henrike@webrtc.org https://code.google.com/p/webrtc/source/detail?r=6202 didn't work for at least one file and broke most of  the compile steps in the FYI bots. The file is reverted here.
Patch from henrike@webrtc.org
https://code.google.com/p/webrtc/source/detail?r=6202
didn't work for at least one file and broke most of 
the compile steps in the FYI bots. The file is reverted
here.

TBR= henrike@webrtc.org, sergeyu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/17609004

Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 86df8acc92a5c0ae8bb82b8b853c31eedc6a6bec

sippet/webrtc,sippet/webrtc,sippet/webrtc,sippet/webrtc,sippet/webrtc,sippet/webrtc