Merge "Exclude vendor_boot in secondary payload" am: 7a3cf2c4ba

Change-Id: I348a3c8093e85780bd641d460040b19a6878afda