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

Change-Id: If560c95b4e4ef3d9c7b55df4da44ea611a4e3756