diff --git a/java/androidmk.go b/java/androidmk.go
index 42b4ef1..e37a90e 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -200,7 +200,7 @@
 		dexpreoptEntries := prebuilt.dexpreopter.AndroidMkEntriesForApex()
 		return append(dexpreoptEntries, android.AndroidMkEntries{Disabled: true})
 	}
-	if !prebuilt.ContainingSdk().Unversioned() {
+	if android.IsModuleInVersionedSdk(prebuilt) {
 		return []android.AndroidMkEntries{android.AndroidMkEntries{
 			Disabled: true,
 		}}