Merge "Add apache-xml to core-system-modules"