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

* commit '786e5e263bdc716f4b2d871191e64726e552acdb':
  libutils: cleanups for -fsanitize=integer