Move ViewMatrix off of drawstate

BUG=skia:

Review URL: https://codereview.chromium.org/815553003
diff --git a/gm/rrects.cpp b/gm/rrects.cpp
index bacc819..e6c62e9 100644
--- a/gm/rrects.cpp
+++ b/gm/rrects.cpp
@@ -126,7 +126,8 @@
                             SkRect bounds = rrect.getBounds();
                             bounds.outset(2.f, 2.f);
 
-                            tt.target()->drawSimpleRect(&drawState, 0xff000000, bounds);
+                            tt.target()->drawSimpleRect(&drawState, 0xff000000, SkMatrix::I(),
+                                                        bounds);
                         } else {
                             drew = false;
                         }