Merge "Make apex_key HostAndDeviceDefault"
diff --git a/apex/key.go b/apex/key.go
index a627e4b..229d593 100644
--- a/apex/key.go
+++ b/apex/key.go
@@ -55,8 +55,7 @@
 func apexKeyFactory() android.Module {
 	module := &apexKey{}
 	module.AddProperties(&module.properties)
-	// This module is device-only
-	android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
+	android.InitAndroidArchModule(module, android.HostAndDeviceDefault, android.MultilibCommon)
 	return module
 }