Adjust with changes in libxml2 upgrade am: 415112fea8 am: 6c6c911b02

Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/2773004

Change-Id: I74d535acd2bb8ed30b845960c8217a421c37b692
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>