Android changes for Swift 4.1 cherrypicked into 4.2 (#1631)

* Changes required for swift-4.1-branch port to Android

* Remove contentious wokrarounds

* Centralise test imports and add os(Android)

* Leave imports in xdgTestHelper.swift

Author: johnno1962