GitLab

There were a couple of build file issues that broke the ASAN Debug
bot and the MSAN bots on the lkgr waterfall. This CL fixes those issues,
and also flips the MSAN bots back to GYP since the main MSAN bots
are still kinda broken and it's easier to keep them all consistent.

TBR=mbarbella@chromium.org
BUG=605732

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