Further fixes for the new exporter.

(org-caldav-generate-ics): Use `org-icalendar-combined-agenda-file'
and `org-icalendar--combine-files' if new exporter is available.