Merge "fix size of vendor boot header" am: 33a31ff81a am: f75a87cf1e am: c15b71ae77

Change-Id: I92168efd8a53172daec50e24e52fa15591faf536