Merge "Upgrade to current vfprintf."