Fix GLSL error on Android.

Fix GLSL error on Android.

BUG=skia:
TBR=bsalomon
NOTREECHECKS=true
NOTRY=true

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

[Stephen White, 2015-04-01 22:04:52]

The CQ bit was checked by senorblanco@chromium.org

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

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

[commit-bot: I haz the power, 2015-04-01 22:05:23]

The CQ bit was unchecked by commit-bot@chromium.org

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

Internal error: failed to checkout. Please try again.

[rmistry, 2015-04-01 22:07:43]

On 2015/04/01 22:05:24, I haz the power (commit-bot) wrote:
> Internal error: failed to checkout. Please try again.

I think the target ref here might be confusing the Commit Queue. You can try
specifying master as the target_ref when you git cl upload (I think its called
--target_ref, but I could be wrong).

[rmistry, 2015-04-01 22:08:31]

On 2015/04/01 22:07:43, rmistry wrote:
> On 2015/04/01 22:05:24, I haz the power (commit-bot) wrote:
> > Internal error: failed to checkout. Please try again.
> 
> I think the target ref here might be confusing the Commit Queue. You can try
> specifying master as the target_ref when you git cl upload (I think its called
> --target_ref, but I could be wrong).

The target ref it needs to be is "refs/heads/master"

[Stephen White, 2015-04-01 22:13:03]

The CQ bit was checked by senorblanco@chromium.org

[commit-bot: I haz the power, 2015-04-01 22:13:21]

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

[commit-bot: I haz the power, 2015-04-01 22:13:33]

Committed patchset #2 (id:20001) as
https://skia.googlesource.com/skia/+/f90cd8e0e39af02c3826c80366efa3c06e88f642

[rmistry, 2015-04-01 22:37:37]

On 2015/04/01 22:13:33, I haz the power (commit-bot) wrote:
> Committed patchset #2 (id:20001) as
> https://skia.googlesource.com/skia/+/f90cd8e0e39af02c3826c80366efa3c06e88f642

Looks like this assertion still fails:
https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Mac10.9-Clan...

[rmistry, 2015-04-01 22:38:42]

On 2015/04/01 22:37:37, rmistry wrote:
> On 2015/04/01 22:13:33, I haz the power (commit-bot) wrote:
> > Committed patchset #2 (id:20001) as
> >
https://skia.googlesource.com/skia/+/f90cd8e0e39af02c3826c80366efa3c06e88f642
> 
> Looks like this assertion still fails:
>
https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Mac10.9-Clan...

and this one:
https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Ubuntu-GCC-S...

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

A revert of this CL (patchset #2 id:20001) has been created in
https://codereview.chromium.org/1056713002/ by rmistry@google.com.

The reason for reverting is: Spoke to Stephan about this. Reverting because
failing debug builds:

https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Mac10.9-Clan...
https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Ubuntu-GCC-S....