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