Merge "Exclude vendor_boot in secondary payload"