Merge "add vendor_boot image support"