Bug 1081246 - Roll out Gip split to trunk branches, r=jlund