Merge "OverridableModuleBase shouldn't embed ModuleBase."

am: 0b4ca8605c

Change-Id: I588842034cef9fc6fba5e8c625a2de58fc20cb0f

android/override_module.go

@@ -95,8 +95,6 @@ type OverridableModule interface {
 
 // Base module struct for overridable module types
 type OverridableModuleBase struct {
-	ModuleBase
-
 	// List of OverrideModules that override this base module
 	overrides []OverrideModule
 	// Used to parallelize registerOverrideMutator executions. Note that only addOverride locks this
@@ -144,7 +142,7 @@ func (b *OverridableModuleBase) override(ctx BaseModuleContext, o OverrideModule
 	// Adds the base module to the overrides property, if exists, of the overriding module. See the
 	// comment on OverridableModuleBase.overridesProperty for details.
 	if b.overridesProperty != nil {
-		*b.overridesProperty = append(*b.overridesProperty, b.Name())
+		*b.overridesProperty = append(*b.overridesProperty, ctx.ModuleName())
 	}
 	for _, p := range b.overridableProperties {
 		for _, op := range o.getOverridingProperties() {