[automerger skipped] fix size of vendor boot header am: 5bb77e1e am: 03b5bc0b am: 72f2aa5d am: db85e832 -s ours am skip reason: Change-Id Ib42222f29a7a75f552cc886437b8967f195227b5 with SHA-1 5bb77e1e is in history Change-Id: Ib330e903f53ff5baf332518aa290519ca44bd4c1