Merge "Last bit of GrGLSLFragmentProcessor-derived class cleanup" into master-skia

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

Change-Id: I371724bf5d61d997e49a897afec17f4f682dd2dd