Merge "Fix sizeof warnings on unusual calloc"