clean up some old busted color routines

Change-Id: I6e1dcce0b1fd7e4a01dc44c07173e9742922d2c0
Reviewed-on: https://skia-review.googlesource.com/141044
Auto-Submit: Mike Klein <mtklein@chromium.org>
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2 files changed