Replace int64 with a definition to int64_t, and fix code that assumed that
int64 == long long.

Change-Id: I11b415d7cf029880d4c0e1a331799c82dfcadae1