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>
6 files changed