Merge "Follow signature update to ExtendMatchingProperties" into main

	// order checks the `android:"variant_prepend"` tag to handle properties where the

	// arch-specific value needs to come before the generic value, for example for lists of

	// include directories.

	order := func(property string,

		dstField, srcField reflect.StructField,

		dstValue, srcValue interface{}) (proptools.Order, error) {

	order := func(dstField, srcField reflect.StructField) (proptools.Order, error) {

		if proptools.HasTag(dstField, "android", "variant_prepend") {

			return proptools.Prepend, nil

		} else {