GitLab

Fixes for iOS compile.

BUG=None

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

Cr-Commit-Position: refs/heads/master@{#322526}