diff --git a/android/config.go b/android/config.go
index 43d743b..2ce7f48 100644
--- a/android/config.go
+++ b/android/config.go
@@ -31,6 +31,7 @@
 
 var Bool = proptools.Bool
 var String = proptools.String
+var FutureApiLevel = 10000
 
 // The configuration file name
 const configFileName = "soong.config"
@@ -453,7 +454,7 @@
 	if Bool(c.ProductVariables.Platform_sdk_final) {
 		return c.PlatformSdkVersionInt()
 	} else {
-		return 10000
+		return FutureApiLevel
 	}
 }
 
@@ -657,6 +658,17 @@
 	return c.config.ProductVariables.ExtraVndkVersions
 }
 
+func (c *deviceConfig) SystemSdkVersions() []string {
+	if c.config.ProductVariables.DeviceSystemSdkVersions == nil {
+		return nil
+	}
+	return *c.config.ProductVariables.DeviceSystemSdkVersions
+}
+
+func (c *deviceConfig) PlatformSystemSdkVersions() []string {
+	return c.config.ProductVariables.Platform_systemsdk_versions
+}
+
 func (c *deviceConfig) OdmPath() string {
 	if c.config.ProductVariables.OdmPath != nil {
 		return *c.config.ProductVariables.OdmPath