Merge "mark all SkImage methods const, so we can make it thread-safe" into master-skia

https://skia.googlesource.com/skia/+/8572fc0

Change-Id: If045de25ee84d2a6fcadd4a39d3719ce7c7931f0