Reland the build fix patch I've reverted by mistake.

Reland the build fix patch I've reverted by mistake.

----

[M54] Fix build.

TBR=asanka@chromium.org
BUG=648366
Review URL: https://codereview.chromium.org/2438673002 .

Cr-Commit-Position: refs/branch-heads/2840@{#764}
Cr-Branched-From: 1ae106dbab4bddd85132d5b75c670794311f4c57-refs/heads/master@{#414607}
(cherry picked from commit c0f81dce2f86e7dd4f87d68a1fc8501e29db2aad)

Committed: https://chromium.googlesource.com/chromium/src/+/08b7b4ad879c71ce3cfa82a83343c54a1e37a043

[tyoshino (SeeGerritForStatus), 2016-10-31 07:59:56]

Description was changed from

==========
Reland the build fix patch I've reverted by mistake.

[M54] Fix build.

TBR=asanka@chromium.org
BUG=648366

Review URL: https://codereview.chromium.org/2438673002 .

Cr-Commit-Position: refs/branch-heads/2840@{#764}
Cr-Branched-From:
1ae106dbab4bddd85132d5b75c670794311f4c57-refs/heads/master@{#414607}
(cherry picked from commit c0f81dce2f86e7dd4f87d68a1fc8501e29db2aad)
==========

to

==========
Reland the build fix patch I've reverted by mistake.

----

[M54] Fix build.

TBR=asanka@chromium.org
BUG=648366

Review URL: https://codereview.chromium.org/2438673002 .

Cr-Commit-Position: refs/branch-heads/2840@{#764}
Cr-Branched-From:
1ae106dbab4bddd85132d5b75c670794311f4c57-refs/heads/master@{#414607}
(cherry picked from commit c0f81dce2f86e7dd4f87d68a1fc8501e29db2aad)
==========

[tyoshino (SeeGerritForStatus), 2016-10-31 08:04:22]

Description was changed from

==========
Reland the build fix patch I've reverted by mistake.

----

[M54] Fix build.

TBR=asanka@chromium.org
BUG=648366

Review URL: https://codereview.chromium.org/2438673002 .

Cr-Commit-Position: refs/branch-heads/2840@{#764}
Cr-Branched-From:
1ae106dbab4bddd85132d5b75c670794311f4c57-refs/heads/master@{#414607}
(cherry picked from commit c0f81dce2f86e7dd4f87d68a1fc8501e29db2aad)
==========

to

==========
Reland the build fix patch I've reverted by mistake.

----

[M54] Fix build.

TBR=asanka@chromium.org
BUG=648366

Review URL: https://codereview.chromium.org/2438673002 .

Cr-Commit-Position: refs/branch-heads/2840@{#764}
Cr-Branched-From:
1ae106dbab4bddd85132d5b75c670794311f4c57-refs/heads/master@{#414607}
(cherry picked from commit c0f81dce2f86e7dd4f87d68a1fc8501e29db2aad)

Committed:
https://chromium.googlesource.com/chromium/src/+/08b7b4ad879c71ce3cfa82a83343...
==========

[tyoshino (SeeGerritForStatus), 2016-10-31 08:04:25]

Committed patchset #1 (id:1) manually as
08b7b4ad879c71ce3cfa82a83343c54a1e37a043 (presubmit successful).