Backport two patches from master to fix fwupd-efi
    
    Several x86-64 platforms all using AMI BIOS that reject the signed EFI binary
    if we did not specify a 512 byte alignment.
    
    It's certainly possible this is a bug in the AMI firmware.
    
    See https://github.com/fwupd/fwupd-efi/pull/40