[aur-general] Merge grub-gfx into grub-legacy