Re-land "Fixed an issue with sksl variable declarations"

This reverts commit affa6a3da87e9ea85f1d4fe3137b5bccbbc56f92.

Bug: skia:
Change-Id: I5864830e31acbf786f3ea7ae91f42f10aae6d855
Reviewed-on: https://skia-review.googlesource.com/18459
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
9 files changed