Merge "Support missing a shared library variant."

	allTransitiveDeps := make(map[android.Path][]android.Path, len(staticDeps))

	staticDepFiles := []android.Path{}

	for _, dep := range staticDeps {

		// The OutputFile may not be valid for a variant not present, and the AllowMissingDependencies flag is set.

		if dep.OutputFile().Valid() {

			allTransitiveDeps[dep.OutputFile().Path()] = dep.GetDepsInLinkOrder()

			staticDepFiles = append(staticDepFiles, dep.OutputFile().Path())

		}

	}

	sharedDepFiles := []android.Path{}

	for _, sharedDep := range sharedDeps {

		if sharedDep.HasStaticVariant() {