Make automerge easier for property overrides in vendor.mk

Change-Id: I2c0e0226091cf886439c6886bdd65ce479cd38a2
1 file changed