Merge "Unify XML parsing and fix problem with AARs"