Grub fixes for EC2 HVM images.