Merge "Add boot / vendor boot image header version 4"