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

Change-Id: I00a660ff735f0732f80e04ca181a7f23240bda49