[automerger skipped] fix size of v3 boot header am: 41bec4c4 am: 82a5e8ba -s ours am: a3dc0b4d -s ours am skip reason: Change-Id I709dacbf3552e09ff0705de45ac178a293971e2b with SHA-1 9f28439b is in history Change-Id: I402e5cc805ba8554f224b6130bf3db9c813b3168