Merge "SkImageEncoder: simplify API" into master-skia

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

Change-Id: If263f5fa5e8fe6e637beb4084d814344218050a3