Merge "Support local cuttlefish instances with mixed vendor_boot.img"