Build fixes for linux desktop CrOS builders.

Build fixes for linux desktop CrOS builders.

This almost gets them ready to be flipped to GN.

R=brettw@chromium.org, stevenjb@chromium.org
BUG=433082
Committed: https://crrev.com/94c6fb2993332b635ef9f3e786381487a6c10422
Cr-Commit-Position: refs/heads/master@{#399068}

[Dirk Pranke, 2016-06-09 21:08:46]

The CQ bit was checked by dpranke@chromium.org to run a CQ dry run

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

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

[stevenjb, 2016-06-09 21:12:42]

lgtm

[brettw, 2016-06-09 21:34:14]

lgtm

[commit-bot: I haz the power, 2016-06-09 23:58:31]

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

[commit-bot: I haz the power, 2016-06-09 23:58:32]

Dry run: Try jobs failed on following builders:
  linux_android_rel_ng on tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)

[Dirk Pranke, 2016-06-10 00:27:36]

The CQ bit was checked by dpranke@chromium.org

[commit-bot: I haz the power, 2016-06-10 00:28:04]

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

[commit-bot: I haz the power, 2016-06-10 01:55:31]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-06-10 01:56:34]

Description was changed from

==========
Build fixes for linux desktop CrOS builders.

This almost gets them ready to be flipped to GN.

R=brettw@chromium.org, stevenjb@chromium.org
BUG=433082
==========

to

==========
Build fixes for linux desktop CrOS builders.

This almost gets them ready to be flipped to GN.

R=brettw@chromium.org, stevenjb@chromium.org
BUG=433082

Committed: https://crrev.com/94c6fb2993332b635ef9f3e786381487a6c10422
Cr-Commit-Position: refs/heads/master@{#399068}
==========

[commit-bot: I haz the power, 2016-06-10 01:56:35]

Patchset 1 (id:??) landed as
https://crrev.com/94c6fb2993332b635ef9f3e786381487a6c10422
Cr-Commit-Position: refs/heads/master@{#399068}