Merge "Prepare for adding apache-xml to core APIs"