Merge commit '18890f471c420411aa3c989e104d090966ec9dbf' into libxml2 Bug: 79662501 Test: manual - phone boots, xml parsing works Change-Id: I7fd671deb249ea42de674f6c6b9c967f8b6556bf