This also ports some build overrides including:
https://codereview.chromium.org/2512043002/

BUG=chromium:659726

Review-Url: https://codereview.chromium.org/2532043002
Cr-Commit-Position: refs/heads/master@{#41347}