Merge "Add local-vendor-boot-image argument to set vendor boot image" into main