Merge "app: aboot: add support for new boot image format"