change int32, int64 -> int32_t, int64_t Fix types. Change-Id: I8c14a325db0740206eaeefe9d5f00c8c568102cb