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

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

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