Adjust with changes in libxml2 upgrade am: 8029a0567c am: 84d132ecc7 am: 686b10ab11

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2772704

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