Merge "Populate header size for boot image header version 2 correctly"