Revert of Fix compile error on MSAN bot

Revert of Fix compile error on MSAN bot (patchset #1 id:1 of https://codereview.chromium.org/2142653002/ )

Reason for revert:
Reverting CL that this is based on

Original issue's description:
> Fix compile error on MSAN bot
> 
> TBR=reed@google.com
> 
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2142653002
> 
> Committed: https://skia.googlesource.com/skia/+/76c52ace16a7846d7d2ddf166d64572546f2de69

TBR=
# 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/+/bed41afa5f663a6c42f9d4e3f42c46a148f5d44a

[msarett, 2016-07-11 21:54:37]

The CQ bit was checked by msarett@google.com

[msarett, 2016-07-11 21:54:37]

Created Revert of Fix compile error on MSAN bot

[commit-bot: I haz the power, 2016-07-11 21:54:52]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-11 21:54:57]

Description was changed from

==========
Revert of Fix compile error on MSAN bot (patchset #1 id:1 of
https://codereview.chromium.org/2142653002/ )

Reason for revert:
Reverting CL that this is based on

Original issue's description:
> Fix compile error on MSAN bot
> 
> TBR=reed@google.com
> 
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2142653002
> 
> Committed:
https://skia.googlesource.com/skia/+/76c52ace16a7846d7d2ddf166d64572546f2de69

TBR=
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
==========

to

==========
Revert of Fix compile error on MSAN bot (patchset #1 id:1 of
https://codereview.chromium.org/2142653002/ )

Reason for revert:
Reverting CL that this is based on

Original issue's description:
> Fix compile error on MSAN bot
> 
> TBR=reed@google.com
> 
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2142653002
> 
> Committed:
https://skia.googlesource.com/skia/+/76c52ace16a7846d7d2ddf166d64572546f2de69

TBR=
# 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/+/bed41afa5f663a6c42f9d4e3f42c46a148f5d44a
==========

[commit-bot: I haz the power, 2016-07-11 21:54:58]

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