Merge "Add copy-many-files macro." into ics-aah