Merge "Use find-copy-subdir-files macro to eliminate foreach calls"