am 1cab2921: Skia merge (revision 3022)

* commit '1cab2921ab279367f8206cdadc9259d12e603548':
  Skia merge (revision 3022)