am 78d632a0: (-s ours) am 38f4a139: am 532e6cde: Merge "libcutils: cleanups for -fsanitize=integer"

* commit '78d632a01de2231ef567cf9a6cf32f9895ceb716':