Adjust with changes in libxml2 upgrade am: 8029a0567c am: 78f7efc963 am: 8ad6130dbe

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

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