Landing this must be coordinated with updating the buildbots in https://codereview.chromium.org/1681393004 R=pthatcher@webrtc.org TBR=henrika@webrtc.org BUG=webrtc:5420 NOTRY=True Review URL: https://codereview.webrtc.org/1683163002 . Cr-Commit-Position: refs/heads/master@{#11600}