Fix flashing... could be done in a way that is more tolerant of noobs flashing the wrong g2's zip, but it'd be their own damn fault, so meh.

Change-Id: I2c529f381bfb6ee732901574af031756b249a7a7