Merge mesa win gn fix from https://codereview.chromium.org/707733006/

TBR=scottmg

Review URL: https://codereview.chromium.org/683733014