Revert of Fix GLSL error on Android.

Revert of Fix GLSL error on Android. (patchset #2 id:20001 of https://codereview.chromium.org/1053873002/)

Reason for revert:
Spoke to Stephan about this. Reverting because failing debug builds:

https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Mac10.9-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug/builds/51
https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug/builds/54

Original issue's description:
> Fix GLSL error on Android.
> 
> BUG=skia:
> TBR=bsalomon
> NOTREECHECKS=true
> NOTRY=true
> 
> Committed: https://skia.googlesource.com/skia/+/f90cd8e0e39af02c3826c80366efa3c06e88f642

TBR=bsalomon@google.com,senorblanco@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Committed: https://skia.googlesource.com/skia/+/fd40a249d814c3ca990422348266662a1521fb45

[rmistry, 2015-04-01 22:50:51]

Created Revert of Fix GLSL error on Android.

[commit-bot: I haz the power, 2015-04-01 22:51:24]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1056713002/1

[commit-bot: I haz the power, 2015-04-01 22:51:39]

Committed patchset #1 (id:1) as
https://skia.googlesource.com/skia/+/fd40a249d814c3ca990422348266662a1521fb45