don't toggle between Paint and SkPaint

Test: make

Change-Id: Id5864591db0577a24833bbb90036b9554ce130d4
5 files changed