Merge "Adjust with changes in libxml2 upgrade" into main am: da32cbba

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2772645



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

native/android/system_fonts.cpp

@@ -21,22 +21,20 @@
 #include <android/font.h>
 #include <android/font_matcher.h>
 #include <android/system_fonts.h>
-
-#include <memory>
-#include <string>
-#include <vector>
-
 #include <errno.h>
 #include <fcntl.h>
-#include <libxml/tree.h>
-#include <log/log.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
 #include <hwui/MinikinSkia.h>
+#include <libxml/parser.h>
+#include <log/log.h>
 #include <minikin/FontCollection.h>
 #include <minikin/LocaleList.h>
 #include <minikin/SystemFonts.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <memory>
+#include <string>
+#include <vector>
 
 struct XmlCharDeleter {
     void operator()(xmlChar* b) { xmlFree(b); }