Revert of Work around exasperating Google3 Android build error.

Revert of Work around exasperating Google3 Android build error. (patchset #1 id:1 of https://codereview.chromium.org/1649493005/ )

Reason for revert:
This workaround no longer seems to be necessary.

Original issue's description:
> Work around exasperating Google3 Android build error.
> 
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1649493005
> 
> Committed: https://skia.googlesource.com/skia/+/900901fb1ba5170549670829fc8f9d9b590ff5f0

TBR=mtklein@google.com,reed@google.com
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=skia:

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

[dogben, 2016-02-03 23:59:59]

Created Revert of Work around exasperating Google3 Android build error.

[commit-bot: I haz the power, 2016-02-04 00:00:01]

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

[commit-bot: I haz the power, 2016-02-04 00:02:19]

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

[commit-bot: I haz the power, 2016-02-04 00:29:27]

Description was changed from

==========
Revert of Work around exasperating Google3 Android build error. (patchset #1
id:1 of https://codereview.chromium.org/1649493005/ )

Reason for revert:
This workaround no longer seems to be necessary.

Original issue's description:
> Work around exasperating Google3 Android build error.
> 
> BUG=skia:
> GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
> 
> Committed:
https://skia.googlesource.com/skia/+/900901fb1ba5170549670829fc8f9d9b590ff5f0

TBR=mtklein@google.com,reed@google.com
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=skia:
==========

to

==========
Revert of Work around exasperating Google3 Android build error. (patchset #1
id:1 of https://codereview.chromium.org/1649493005/ )

Reason for revert:
This workaround no longer seems to be necessary.

Original issue's description:
> Work around exasperating Google3 Android build error.
> 
> BUG=skia:
> GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
> 
> Committed:
https://skia.googlesource.com/skia/+/900901fb1ba5170549670829fc8f9d9b590ff5f0

TBR=mtklein@google.com,reed@google.com
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=skia:

Committed:
https://skia.googlesource.com/skia/+/ff172dab92b40af96cbf284588ab5ed20982a001
==========

[commit-bot: I haz the power, 2016-02-04 00:29:28]

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