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

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

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