GitLab

* Includes fixes from recent github commits.
* Chromium fixes for load-balancing and Android build.

BUG=

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