- Resolve merge conflicts

- Update to gnu-efi 3.0.2
+ Fix ARM32 and AARCH64 builds
+ _SPrint: fix NULL termination
+ Add current OsIndications values
+ Add the QueryVariableInfo() API
+ Add the capsule API
+ Fix Table Header misspelling. Change from EFI_TABLE_HEARDER to
EFI_TABLE_HEADER.
+ Allow reuse of this file beyond GPL compatible software, update
the license of crt0-efi-aarch64.S to dual 2-clause BSD/GPLv2+.
+ Add the missing Variable attributes
+ document that binutils >= 2.24 needed
+ allow to use external stdarg.h
+ Add support for 32-bit ARM
- Enable ARM 32
- Add upstream patches
+ gnu-efi-setjmp.patch
+ gnu-efi-missing-error-code.patch
- Drop patches
+ gnu-efi-allow-external-stdarg.patch (upstreamed)
+ gnu-efi-build-fix.patch (no necessary)