Fix -fsanitize=signed-integer-overflow (when long int is 32-bit)

Change-Id: I25a96479eafa97eccace2879bf8e1af5e85f60c8