Proposed cleanups

Change-Id: I5e748b0681477dfe42f80b084da9acf185e264f9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/801176
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: Herb Derby <herb@google.com>
2 files changed