Purge self.policies from Swift

Since we decided to go with a global policy set that we swap out in
tests, we don't need these dependency-injection remnants any more.

Change-Id: I43411f774c09bd1197db70c3ca8889ba49009e2d
tiny stylistic fixup

Change-Id: I2b14bffbef7992852cbff9864a3369a23aebc4c8
Merge "Purge self.policies from Swift" into feature/ec
Merge "tiny stylistic fixup" into feature/ec