[Import as member] CoreGraphics: Import global vars onto classes

With support from 16baa6, we can now use correct inference bahavior,
which is to import global variables as members on classes.

Author: milseman

apinotes/CoreGraphics.apinotes

@@ -326,16 +326,6 @@ Globals:
   Availability: nonswift
 - Name: kCGColorSpaceGenericRGB
   Availability: nonswift
-# The below are left alone, due to an unknown bug
-# FIXME: fix me
-- Name: kCGColorBlack
-  SwiftName: "kCGColorBlack"
-- Name: kCGColorWhite
-  SwiftName: "kCGColorWhite"
-# TODO: clear as well, but for now it's useful for testing
-- Name: kCGColorSpaceSRGB
-  SwiftName: "kCGColorSpaceSRGB"
-# TODO: other color spaces as well, but for now it's useful for testing
 
 #
 # Enums

test/Interpreter/SDK/CALayer.swift

@@ -22,10 +22,10 @@ func hangCanary(_ o: AnyObject) {
 
 class FooLayer: CALayer {
   var black: CGColor
-  var white: CGColor = CGColor.constantColorForName(kCGColorWhite)!
+  var white: CGColor = CGColor.constantColorForName(CGColor.white)!
 
   override init() {
-    black = CGColor.constantColorForName(kCGColorBlack)!
+    black = CGColor.constantColorForName(CGColor.black)!
     super.init()
     hangCanary(self)
   }

test/Interpreter/SDK/CGImportAsMember.swift

@@ -7,8 +7,8 @@ import CoreGraphics
 
 class Colors {
 	// TODO: when issue is fixed, migrate these to CGColor class properties
-	static var black = CGColor.constantColorForName(kCGColorBlack)!
-	static var white = CGColor.constantColorForName(kCGColorWhite)!
+	static var black = CGColor.constantColorForName(CGColor.black)!
+	static var white = CGColor.constantColorForName(CGColor.white)!
 
 	// FIXME: this triggers an assert in SILVerifier
 	static var clear = CGColor.constantColorForName(CGColor.clear)!
@@ -17,7 +17,7 @@ class Colors {
 		print("Colors") // CHECK: Colors
 		print(black)    // CHECK: Generic Gray Profile
 		print(white)    // CHECK: Generic Gray Profile
-		print(clear)
+		print(clear)    // CHECK: Generic Gray Profile
 	}
 }