rebasing some gms

TBR=
BUG=skia:

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