Merge "SkImageSource" into master-skia

https://skia.googlesource.com/skia/+/cd56f812e09fdd8f8322c5c28cbc4423a74b9a0a

Change-Id: I471c44652a09981f206d6629e5680e4a3bddd13a