Merge pull request #12282 from graydon/rdar-34818636-backport-PR-12257-stats-output-dir-filename-issues-to-swift-4.0-branch

Rdar 34818636 backport pr 12257 stats output dir filename issues to swift 4.0 branch