Revert of add Make variations to return SkImage by sk_sp

Revert of add Make variations to return SkImage by sk_sp (patchset #5 id:80001 of https://codereview.chromium.org/1778393002/ )

Reason for revert:
Experimental revert to try to clear up ASAN failures

Original issue's description:
> add Make variations to return SkImage by sk_sp
> 
> some internal call-sites update, but not. Will follow-up in future to complete that.
> 
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1778393002
> 
> Committed: https://skia.googlesource.com/skia/+/bd73ffb83022f1f6b1997e2a91c049949e88a8a2

TBR=fmalita@chromium.org,bsalomon@google.com,reed@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Committed: https://skia.googlesource.com/skia/+/e683c56115a210b5993df9294260bb147b408bfa

[robertphillips, 2016-03-11 00:18:35]

Created Revert of add Make variations to return SkImage by sk_sp

[commit-bot: I haz the power, 2016-03-11 00:18:38]

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

[commit-bot: I haz the power, 2016-03-11 00:18:51]

Description was changed from

==========
Revert of add Make variations to return SkImage by sk_sp (patchset #5 id:80001
of https://codereview.chromium.org/1778393002/ )

Reason for revert:
Experimental revert to try to clear up ASAN failures

Original issue's description:
> add Make variations to return SkImage by sk_sp
> 
> some internal call-sites update, but not. Will follow-up in future to complete
that.
> 
> BUG=skia:
> GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
> 
> Committed:
https://skia.googlesource.com/skia/+/bd73ffb83022f1f6b1997e2a91c049949e88a8a2

TBR=fmalita@chromium.org,bsalomon@google.com,reed@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
==========

to

==========
Revert of add Make variations to return SkImage by sk_sp (patchset #5 id:80001
of https://codereview.chromium.org/1778393002/ )

Reason for revert:
Experimental revert to try to clear up ASAN failures

Original issue's description:
> add Make variations to return SkImage by sk_sp
> 
> some internal call-sites update, but not. Will follow-up in future to complete
that.
> 
> BUG=skia:
> GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
> 
> Committed:
https://skia.googlesource.com/skia/+/bd73ffb83022f1f6b1997e2a91c049949e88a8a2

TBR=fmalita@chromium.org,bsalomon@google.com,reed@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Committed:
https://skia.googlesource.com/skia/+/e683c56115a210b5993df9294260bb147b408bfa
==========

[commit-bot: I haz the power, 2016-03-11 00:18:53]

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