cleanup unused fields/includes

Bug: skia:
Change-Id: I30533cf81631a146b729a530c30bd9831fd0ea7d
Reviewed-on: https://skia-review.googlesource.com/87660
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
1 file changed