Manual revert of "Revise GrDataUtils to be more self-contained"

This reverts commit c70ed90f59025fb24ee6051347364230aa7a5624.

Change-Id: Id418285ec3fb84d28630ba2da0e7435ed92b62ce
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/218957
Auto-Submit: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
9 files changed