A few fixes to make Windows Mojo build work.

R=scottmg@chromium.org

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