Rewrite of PR #1103 + addition Android specific patches#1113

johnno1962 wants to merge 2 commits intoswiftlang:masterswiftlang/swift-corelibs-foundation:masterfrom

johnno1962b:masterjohnno1962b/swift-corelibs-foundation:masterCopy head branch name to clipboard