This reverts commit 06f3aae345854ba9dcc5ae3b603de1f86505acf9. The reason for reverting is that it seems to break Chromium importer. See https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28K%20Nexus5%29/builds/17862 BUG=None TBR=magjed@webrtc.org Review-Url: https://codereview.webrtc.org/2982053002 Cr-Commit-Position: refs/heads/master@{#19058}