Merge "fix size of vendor boot header"