am 38f4a139: am 532e6cde: Merge "libcutils: cleanups for -fsanitize=integer"

* commit '38f4a1391e499c2392cd8136061153cc35438eb3':
  libcutils: cleanups for -fsanitize=integer