Adjust with changes in libxml2 upgrade am: 415112fea8 am: 9aff4f0e90 am: 13608e33c8

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

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