Merge "Add missing va_end() calls in some variadic functions."