Merge "Bootloader: edk2: Remove unused variables in makefile"