Version 4.3.61.18 (cherry-pick)

Merged 3fa1b606

Fix AIX compiler warning

R=machenbach@chromium.org, svenpanne@chromium.org
BUG=

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

Cr-Commit-Position: refs/branch-heads/4.3@{#21}
Cr-Branched-From: f5c0a23a-refs/heads/4.3.61@{#1}
Cr-Branched-From: 0a7d4f49-refs/heads/master@{#27508}