Use iterators instead of file lists

Change-Id: I49ea1075939d8e0d042d15556ea16db9359d3aff
6 files changed