diff --git a/android/config.go b/android/config.go
index f5a5e8e..b415443 100644
--- a/android/config.go
+++ b/android/config.go
@@ -322,10 +322,8 @@
 func (c *config) fromEnv() error {
 	switch c.Getenv("EXPERIMENTAL_USE_OPENJDK9") {
 	case "":
-		if c.Getenv("RUN_ERROR_PRONE") != "true" {
-			// Use OpenJDK9, but target 1.8
-			c.useOpenJDK9 = true
-		}
+		// Use OpenJDK9, but target 1.8
+		c.useOpenJDK9 = true
 	case "false":
 		// Use OpenJDK8
 	case "1.8":
@@ -631,6 +629,10 @@
 	return Bool(c.productVariables.UseGoma)
 }
 
+func (c *config) RunErrorProne() bool {
+	return c.IsEnvTrue("RUN_ERROR_PRONE")
+}
+
 // Returns true if OpenJDK9 prebuilts are being used
 func (c *config) UseOpenJDK9() bool {
 	return c.useOpenJDK9