Warnings in 64-bit.

This reverts commit a0633a7e.

Change-Id: I5b3f31b261b947cd295e9f4a9abbbdbc00740183
Reviewed-on: https://chromium-review.googlesource.com/293841Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>