g2-common: Fix problems flashing with cm-12.0