[automerger skipped] fix size of v3 boot header am: 41bec4c4 -s ours am: d320f43c -s ours am: 87355323 -s ours am skip reason: Change-Id I709dacbf3552e09ff0705de45ac178a293971e2b with SHA-1 41bec4c4 is in history Change-Id: Ief9d30146915e2cb46efe12143d4fd61b16f8cf3