Prep G2 for odex builds