Merge "Removed standard xml packages from apache and import them from elsewhere"