Fix support for 64-bit integers.

Change-Id: I4e2146a5fda41f280ee3f6f685a34f3cff28f05e
8 files changed