Merge changes I89ad92f3,Ife1604c0

am: e51e2feafd

Change-Id: I262c2fcfa7df51b20c8bc15e851d6b7c7d4a8ed1

android/module.go

@@ -970,6 +970,8 @@ func (m *moduleContext) ninjaError(params BuildParams, err error) (PackageContex
 		Description:     params.Description,
 		Output:          params.Output,
 		Outputs:         params.Outputs,
+		ImplicitOutput:  params.ImplicitOutput,
+		ImplicitOutputs: params.ImplicitOutputs,
 		Args: map[string]string{
 			"error": err.Error(),
 		},

java/app.go

@@ -938,6 +938,7 @@ type usesLibrary struct {
 }
 
 func (u *usesLibrary) deps(ctx android.BottomUpMutatorContext, noFrameworkLibs bool) {
+	if !ctx.Config().UnbundledBuild() {
 		ctx.AddVariationDependencies(nil, usesLibTag, u.usesLibraryProperties.Uses_libs...)
 		ctx.AddVariationDependencies(nil, usesLibTag, u.presentOptionalUsesLibs(ctx)...)
 		if !noFrameworkLibs {
@@ -950,6 +951,7 @@ func (u *usesLibrary) deps(ctx android.BottomUpMutatorContext, noFrameworkLibs b
 				"android.hidl.manager-V1.0-java")
 		}
 	}
+}
 
 // presentOptionalUsesLibs returns optional_uses_libs after filtering out MissingUsesLibraries, which don't exist in the
 // build.