Fix grub/linux text mode override.

Apply a wider range of hammers to the recurring issue of images booting
with graphical consoles.

Change-Id: I96345bf8f2f13d615131557b572201b9d41b6c75
Merge "Fix grub/linux text mode override."