GitLab

This is a cherry-pick of the following Skia changes
https://codereview.chromium.org/510913003/
https://codereview.chromium.org/517663002/

bug:17302312
Change-Id: Iec5ad490e1b5eab1b5f3c902b22487d7d52cb92e