Revert "Revert "simplify GrFPArgs, isolating localmatrix""

This reverts commit 3d628fe00a7d6cf4a375d758e7436f104d11417d.

Reason for revert: not needed for roll

Original change's description:
> Revert "simplify GrFPArgs, isolating localmatrix"
> 
> This reverts commit b76c71702517643b5f6081991b376bbf73b34bde.
> 
> Reason for revert: try to unblock android roller
> 
> Original change's description:
> > simplify GrFPArgs, isolating localmatrix
> > 
> > Bug: skia:
> > Change-Id: Icee24e0a355a7d1bae29b7721b4d95db8023ca77
> > Reviewed-on: https://skia-review.googlesource.com/97063
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
> > Commit-Queue: Mike Reed <reed@google.com>
> 
> TBR=bsalomon@google.com,reed@google.com
> 
> Change-Id: Ic7a2288844cde57922b2cc74b855eb517ade48be
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/97580
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>

TBR=bsalomon@google.com,reed@google.com

Change-Id: I6f7b86b5a3243d4610371654624e5606e889adef
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/97584
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
6 files changed