[automerger skipped] fix size of vendor boot header am: 5bb77e1e -s ours am: f360e95c -s ours am: aae25d0f -s ours am skip reason: Change-Id Ib42222f29a7a75f552cc886437b8967f195227b5 with SHA-1 ba07d6e2 is in history Change-Id: I0296934289d821e9afbc158d40d754ac127eaae4