Pull non-substantive changes out of omnibus CL

https://skia-review.googlesource.com/c/skia/+/131500 (Move op memory
storage to GrContext) is still a bit of a monster. Offload the trivial
stuff.

Change-Id: I27eb0c441d08111491b3cfee3b93d260c26c2790
Reviewed-on: https://skia-review.googlesource.com/134501
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
4 files changed