Merge "Add missing va_end() to prevent stack corruptions"