Merge "Keep replace_instead_of_append in arch prop structs" into main

			panic(fmt.Errorf("unexpected tag format %q", field.Tag))

		}

		// these tags don't need to be present in the runtime generated struct type.

		values = RemoveListFromList(values, []string{"arch_variant", "variant_prepend", "path", "replace_instead_of_append"})

		// However replace_instead_of_append does, because it's read by the blueprint

		// property extending util functions, which can operate on these generated arch

		// property structs.

		values = RemoveListFromList(values, []string{"arch_variant", "variant_prepend", "path"})

		if len(values) > 0 {

			if values[0] != "replace_instead_of_append" || len(values) > 1 {

				panic(fmt.Errorf("unknown tags %q in field %q", values, prefix+field.Name))

			}

			field.Tag = `android:"replace_instead_of_append"`

		} else {

			field.Tag = ``

		}

		return true, field

	}

	return false, field