And fixed gcc compilation.

BUG=none
R=alph@chromium.org,dgozman@chromium.org

Review-Url: https://codereview.chromium.org/2668363002
Cr-Commit-Position: refs/heads/master@{#42895}