This reverts r8248 due to some build bot failures. TBR=kwiberg@webrtc.org Review URL: https://webrtc-codereview.appspot.com/40649004 Cr-Commit-Position: refs/heads/master@{#8249} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8249 4adac7df-926f-26a2-2b94-8c16560cd09d