Merge "Revert "Fix format-string-related warnings for size of various types.""