Merge "Move apache-xml to external. (project 4 of 4)"