Similar changes as in https://codereview.chromium.org/2659123003 Our MB configuration is still the actually used build config for these bots. BUG=686304 TBR=smut@google.com Review-Url: https://codereview.webrtc.org/2685813003 . Cr-Commit-Position: refs/heads/master@{#16486}