GitLab

This re-lands the CL with the fixes to the GYP build.

TBR=brettw@chromium.org
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win8_chromium_gyp_rel,win8_chromium_gyp_dbg;tryserver.chromium.mac:mac_chromium_gyp_rel,mac_chromium_gyp_dbg

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