Merge "libutils: cleanups for -fsanitize=integer"