diff --git a/android/defaults.go b/android/defaults.go
index be5359f..eb013d7 100644
--- a/android/defaults.go
+++ b/android/defaults.go
@@ -174,22 +174,20 @@
 
 func InitDefaultsModule(module DefaultsModule) {
 	commonProperties := &commonProperties{}
-	enabledProperties := &enabledProperties{}
 
 	module.AddProperties(
 		&hostAndDeviceProperties{},
-		enabledProperties,
 		commonProperties,
 		&ApexProperties{},
 		&distProperties{})
 
-	base := module.base()
 	initAndroidModuleBase(module)
 	initProductVariableModule(module)
 	InitArchModule(module)
 	InitDefaultableModule(module)
 
 	// Add properties that will not have defaults applied to them.
+	base := module.base()
 	defaultsVisibility := &DefaultsVisibilityProperties{}
 	module.AddProperties(&base.nameProperties, defaultsVisibility)