Revert of Enable viewer in non-Vulkan builds

Revert of Enable viewer in non-Vulkan builds (patchset #2 id:20001 of https://codereview.chromium.org/2067023002/ )

Reason for revert:
breaking compile bots

Original issue's description:
> Enable viewer in non-Vulkan builds
> 
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2067023002
> 
> Committed: https://skia.googlesource.com/skia/+/746b792a9aad1230ab69158a51c49b2e5437d95b

TBR=djsollen@google.com,jvanverth@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Committed: https://skia.googlesource.com/skia/+/963632f686cd642344429f64e6a53262fe592828

[egdaniel, 2016-06-15 21:23:27]

The CQ bit was checked by egdaniel@google.com

[egdaniel, 2016-06-15 21:23:29]

Created Revert of Enable viewer in non-Vulkan builds

[commit-bot: I haz the power, 2016-06-15 21:23:36]

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

[commit-bot: I haz the power, 2016-06-15 21:23:43]

Description was changed from

==========
Revert of Enable viewer in non-Vulkan builds (patchset #2 id:20001 of
https://codereview.chromium.org/2067023002/ )

Reason for revert:
breaking compile bots

Original issue's description:
> Enable viewer in non-Vulkan builds
> 
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2067023002
> 
> Committed:
https://skia.googlesource.com/skia/+/746b792a9aad1230ab69158a51c49b2e5437d95b

TBR=djsollen@google.com,jvanverth@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
==========

to

==========
Revert of Enable viewer in non-Vulkan builds (patchset #2 id:20001 of
https://codereview.chromium.org/2067023002/ )

Reason for revert:
breaking compile bots

Original issue's description:
> Enable viewer in non-Vulkan builds
> 
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2067023002
> 
> Committed:
https://skia.googlesource.com/skia/+/746b792a9aad1230ab69158a51c49b2e5437d95b

TBR=djsollen@google.com,jvanverth@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Committed:
https://skia.googlesource.com/skia/+/963632f686cd642344429f64e6a53262fe592828
==========

[commit-bot: I haz the power, 2016-06-15 21:23:44]

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