Merge "Allow unversioned_until: "current"." am: 59bed87517

am: ca5750752a

Change-Id: I55e13cf32e8850dae6dcad04303e7845dc295de0

cc/ndk_library.go

@@ -162,6 +162,14 @@ func shouldUseVersionScript(stub *stubDecorator) (bool, error) {
 		return true, nil
 	}
 
+	if stub.properties.Unversioned_until == "current" {
+		if stub.properties.ApiLevel == "current" {
+			return true, nil
+		} else {
+			return false, nil
+		}
+	}
+
 	if stub.properties.ApiLevel == "current" {
 		return true, nil
 	}