Merge crrev.com/1151663002 into M44.

Merge crrev.com/1151663002 into M44.

Patched nearly cleanly, with some cosmetic conflics in SkPicture.h.

Original change:
  Don't serialize SkPictures in SkPictureShaders when in untrusted mode.
  This requires we "first" add a has-picture bool to SkPictureShader serialized format.
  BUG=chromium:486947
, billions and billions of others.
  Review URL: https://codereview.chromium.org/1151663002

NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true
TBR=reed@google.com

Committed: https://skia.googlesource.com/skia/+/1dd3830b7254eaea8d710b256f7f040668f02458

[mtklein_C, 2015-07-07 15:11:28]

The CQ bit was checked by mtklein@chromium.org

[commit-bot: I haz the power, 2015-07-07 15:11:43]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1231433004/1

[commit-bot: I haz the power, 2015-07-07 15:11:43]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-07-07 15:11:44]

CLs for remote refs other than refs/heads/master must contain NOTRY=true and
NOPRESUBMIT=true in order for the CQ to process them

[mtklein_C, 2015-07-07 15:12:48]

The CQ bit was checked by mtklein@chromium.org

[commit-bot: I haz the power, 2015-07-07 15:13:05]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1231433004/1

[commit-bot: I haz the power, 2015-07-07 15:13:14]

Committed patchset #1 (id:1) as
https://skia.googlesource.com/skia/+/1dd3830b7254eaea8d710b256f7f040668f02458