Reapply 23529005 after fixing the build break issue (Chromium:582133002)

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7253 4adac7df-926f-26a2-2b94-8c16560cd09d