Make DeviceFileReporter work properly with non-glob filenames

Bug: 5913190
Bug: 6156967
Change-Id: I917c88807a4e11d5c8a26aeaf5d8adec9c6649cd
2 files changed