Reland "Preserve colorType and alphaType in SkImage::makeColorSpace"

This reverts commit 0d08b3e4b112fb10a07d223a48fa0a40091f88b1.

Reason for revert: Fixed Chrome test.

Original change's description:
> Revert "Preserve colorType and alphaType in SkImage::makeColorSpace"
> 
> This reverts commit d842557c07246546ff15aede9d3b4e078c62b7e4.
> 
> Reason for revert: Chrome roll failing CanvasAsyncBlobCreatorTest.ColorManagedConvertToBlob test.
> 
> Original change's description:
> > Preserve colorType and alphaType in SkImage::makeColorSpace
> > 
> > Raster images were always converting to N32, and GPU images were
> > always converting to premul. These were unexpected and inconsistent.
> > 
> > Bug: skia:8382
> > Change-Id: I78fe6cff1208eef077a71d08e676cf8f8d5fed9a
> > Reviewed-on: https://skia-review.googlesource.com/156142
> > Commit-Queue: Brian Osman <brianosman@google.com>
> > Reviewed-by: Mike Klein <mtklein@google.com>
> 
> TBR=mtklein@google.com,brianosman@google.com
> 
> Change-Id: I366b097644ac1fa920fc9addcad3e09c2a0a63cc
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:8382
> Reviewed-on: https://skia-review.googlesource.com/156184
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>

TBR=mtklein@google.com,brianosman@google.com

Change-Id: I860f33a1d57e0e77ce63b78d66d49a1082d2b4dd
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:8382
Reviewed-on: https://skia-review.googlesource.com/156188
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
11 files changed