[automerger skipped] fix size of v3 boot header am: 41bec4c46b am: 82a5e8ba5b -s ours

am skip reason: Change-Id I709dacbf3552e09ff0705de45ac178a293971e2b with SHA-1 9f28439ba7 is in history

Change-Id: I7a89286519e55053a4384e4298ffa417d339a294