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

Change-Id: I4bb27bf30fa0e5e538ca73e420ae2d91e8b0d286