Fix Mojo and Mandoline builds.

Fix Mojo and Mandoline builds.

Fixes breaks from two recent CLs:
  https://codereview.chromium.org/1091513005
  https://codereview.chromium.org/1109943002

BUG=NONE
TEST=ToT builds mojo and mandoline.
R=sky@chromium.org
TBR=jam@chromium.org,ben@chromium.org

Committed: https://crrev.com/6686fc0814368f17eceb30dcb4fdb6f90efa11e2
Cr-Commit-Position: refs/heads/master@{#327190}

[msw, 2015-04-27 23:46:41]

Hey John and Ben, please take a look; thanks!
(I'll ensure CQ and main waterfall bots build these ASAP)

[sky, 2015-04-27 23:58:11]

sky@chromium.org changed reviewers:
+ sky@chromium.org

[sky, 2015-04-27 23:58:11]

LGTM

[msw, 2015-04-27 23:59:03]

The CQ bit was checked by msw@chromium.org

[commit-bot: I haz the power, 2015-04-27 23:59:15]

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

[jam, 2015-04-28 00:00:35]

lgtm thanks

[commit-bot: I haz the power, 2015-04-28 00:19:13]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2015-04-28 00:20:00]

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