Merge "Populate header size for boot image header version 2 correctly" am: 1420c1371f
am: b991a1cc28

Change-Id: Icfb4748df5955faae13702133a94903ed602ec98