Tag build swift-DEVELOPMENT-SNAPSHOT-2016-07-25-a

Fix a merge error causing a build failure on Linux.

Adapt to Swift 3 Foundation API changes

(cherry picked from commit f13fb2f)

Tag build swift-DEVELOPMENT-SNAPSHOT-2016-06-20-a

Tag build swift-DEVELOPMENT-SNAPSHOT-2016-06-06-a

Tag build swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a

Tag build swift-3.0-preview-1-SNAPSHOT-2016-05-31-a

Tag build swift-DEVELOPMENT-SNAPSHOT-2016-05-09-a

Tag build swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a

Tag build swift-DEVELOPMENT-SNAPSHOT-2016-04-25-a