Clean up dependency chains.

This is a fallout of trying to fix the dependency issues in
SubRunContainer.cpp. While I couldn't address that issue, this does
reduce some of the long chains we were ending up with.

Change-Id: Ic99eabf71c999849f77313474991ff9840b368d7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/593916
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
20 files changed