Small cleanups after GrDrawState/GrOptDrawState base class elimination.

Review URL: https://codereview.chromium.org/739133004
8 files changed