Merge "Track libxml2 API changes."