Work around exasperating Google3 Android build error.

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

[dogben, 2016-01-28 18:10:21]

Description was changed from

==========
Work around exasperating Google3 Android build error.

BUG=skia:
==========

to

==========
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...
==========

[dogben, 2016-01-28 18:10:37]

The CQ bit was checked by benjaminwagner@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-01-28 18:10:43]

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

[commit-bot: I haz the power, 2016-01-28 18:22:39]

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

[commit-bot: I haz the power, 2016-01-28 18:22:39]

Dry run: This issue passed the CQ dry run.

[dogben, 2016-01-28 18:23:19]

benjaminwagner@google.com changed reviewers:
+ mtklein@google.com

[reed1, 2016-01-28 20:51:14]

reed@google.com changed reviewers:
+ reed@google.com

[reed1, 2016-01-28 20:51:14]

lgtm

[dogben, 2016-01-28 20:54:54]

The CQ bit was checked by benjaminwagner@google.com

[commit-bot: I haz the power, 2016-01-28 20:54:56]

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

[commit-bot: I haz the power, 2016-01-28 20:55:35]

Description was changed from

==========
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...
==========

to

==========
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
==========

[commit-bot: I haz the power, 2016-01-28 20:55:36]

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

[mtklein, 2016-01-28 22:02:28]

wtf, lgtm

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

A revert of this CL (patchset #1 id:1) has been created in
https://codereview.chromium.org/1669663003/ by benjaminwagner@google.com.

The reason for reverting is: This workaround no longer seems to be necessary..