GitLab

These are mostly mechanical changes found while attempting to compile
the Android build with libc++.

BUG=427718
TBR=darin@chromium.org

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

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