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

Change-Id: Ia6f1b60108784660c4a2dfd311592207e6bf5d88