am 8b63df9e: Merge "Fix format-string-related warnings for size of various types."

* commit '8b63df9eed7c5a2bc8b05bb4d604739dde34a888':
  Fix format-string-related warnings for size of various types.