am 4f0a7cb8: am 786e5e26: Merge "libutils: cleanups for -fsanitize=integer"

* commit '4f0a7cb8e15ce50f7da6a71c96335bd0b7394492':
  libutils: cleanups for -fsanitize=integer