Merge "Suppress sizeof warnings on unusual calloc/realloc"