Merge "hikey: uefi-tools: Update UEFI tools to match updated UEFI sources"