merge with emu-lite again

diff --cc grub-core/bus/usb/emu/usb.c
Simple merge

diff --cc grub-core/conf/any-emu.rmk
Simple merge

diff --cc grub-core/conf/i386-pc.rmk
Simple merge

diff --cc grub-core/conf/i386-qemu.rmk
Simple merge

diff --cc grub-core/conf/mips.rmk
Simple merge

diff --cc grub-core/conf/sparc64-ieee1275.rmk
Simple merge

diff --cc grub-core/conf/x86-efi.rmk
Simple merge

diff --cc grub-core/include/grub/emu/misc.h
Simple merge

diff --cc grub-core/kern/emu/getroot.c
Simple merge

diff --cc grub-core/kern/emu/misc.c
Simple merge

diff --cc util/misc.c
Simple merge