Merge "libcutils: cleanups for -fsanitize=integer"